r23504 - in /desktop/experimental/gdm3/debian: changelog control control.in gdm3.install gdmsetup.svg patches/12_polkit_settings.patch patches/13_gdmsetup.patch patches/90_relibtoolize.patch patches/series
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Thu Apr 1 19:18:40 UTC 2010
Author: lethalman-guest
Date: Thu Apr 1 19:18:39 2010
New Revision: 23504
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23504
Log:
* debian/control.in:
- Added libpolkit-gobject-1-dev and libpolkit-gtk-1-dev build-depends
for gdmsetup patch.
* debian/patches/12_polkit_settings.patch:
- Added, make it possible for users to change gdm system settings.
* debian/patches/13_gdmsetup.patch:
- Added a modified version of Ubuntu patch, brings back the gdmsetup
binary for changing gdm system settings.
* debian/gdmsetup.svg:
- Added, use this icon instead of old gdm-setup.png.
Added:
desktop/experimental/gdm3/debian/gdmsetup.svg
desktop/experimental/gdm3/debian/patches/12_polkit_settings.patch
desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/gdm3.install
desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch
desktop/experimental/gdm3/debian/patches/series
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Thu Apr 1 19:18:39 2010
@@ -1,10 +1,20 @@
gdm3 (2.30.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/control.in:
+ - Added libpolkit-gobject-1-dev and libpolkit-gtk-1-dev build-depends
+ for gdmsetup patch.
* debian/patches/11_xephyr_nested.patch:
- Added, support running gdm in a nested window.
-
- -- Luca Bruno <lethalman88 at gmail.com> Thu, 01 Apr 2010 12:51:39 +0200
+ * debian/patches/12_polkit_settings.patch:
+ - Added, make it possible for users to change gdm system settings.
+ * debian/patches/13_gdmsetup.patch:
+ - Added a modified version of Ubuntu patch, brings back the gdmsetup
+ binary for changing gdm system settings.
+ * debian/gdmsetup.svg:
+ - Added, use this icon instead of old gdm-setup.png.
+
+ -- Luca Bruno <lethalman88 at gmail.com> Thu, 01 Apr 2010 21:07:25 +0200
gdm3 (2.29.92-1) experimental; urgency=low
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Thu Apr 1 19:18:39 2010
@@ -15,16 +15,17 @@
intltool (>= 0.40.0),
gnome-doc-utils,
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.15.4),
- libgtk2.0-dev (>= 2.10.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.12.0),
libpango1.0-dev (>= 1.3.0),
- libglade2-dev (>= 1:1.99.2),
libgconf2-dev (>= 2.6.1),
libpanel-applet2-dev (>= 2.0.0),
libxklavier-dev (>= 4.0),
libcanberra-gtk-dev (>= 0.4),
libfontconfig1-dev (>= 2.5.0),
libdevkit-power-gobject-dev (>= 008),
+ libpolkit-gobject-1-dev (>= 0.92),
+ libpolkit-gtk-1-dev (>= 0.92),
libx11-dev,
libxau-dev,
libxt-dev,
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Thu Apr 1 19:18:39 2010
@@ -19,6 +19,8 @@
libcanberra-gtk-dev (>= 0.4),
libfontconfig1-dev (>= 2.5.0),
libdevkit-power-gobject-dev (>= 008),
+ libpolkit-gobject-1-dev (>= 0.92),
+ libpolkit-gtk-1-dev (>= 0.92),
libx11-dev,
libxau-dev,
libxt-dev,
Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install [utf-8] Thu Apr 1 19:18:39 2010
@@ -6,5 +6,6 @@
debian/gdmflexiserver.svg usr/share/icons/hicolor/scalable/apps
debian/gdmflexiserver-xnest.desktop usr/share/gdm/applications
debian/gdm-xnest.svg usr/share/icons/hicolor/scalable/apps
+debian/gdmsetup.svg usr/share/icons/hicolor/scalable/apps
debian/default.desktop usr/share/gdm/BuiltInSessions
data/session-setup.entries usr/share/gdm/greeter-config
Added: desktop/experimental/gdm3/debian/gdmsetup.svg
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdmsetup.svg?rev=23504&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/gdmsetup.svg (added)
+++ desktop/experimental/gdm3/debian/gdmsetup.svg [utf-8] Thu Apr 1 19:18:39 2010
@@ -1,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45+devel"
+ version="1.0"
+ sodipodi:docbase="/home/lapo/Desktop/per tangerine/scalable"
+ sodipodi:docname="gdm-setup.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6380">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6382" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6384" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient8368">
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="0"
+ id="stop8370" />
+ <stop
+ id="stop8376"
+ offset="0.5"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop8372" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8358">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop8360" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop8362" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3307">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1;"
+ offset="0"
+ id="stop3309" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:0;"
+ offset="1"
+ id="stop3311" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3307"
+ id="linearGradient3313"
+ x1="36.201752"
+ y1="37.667465"
+ x2="32.268337"
+ y2="39.921551"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3315">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop3317" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop3319" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3315"
+ id="linearGradient3321"
+ x1="33.358002"
+ y1="37.386215"
+ x2="33.045502"
+ y2="46.323711"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3355">
+ <stop
+ id="stop3357"
+ offset="0"
+ style="stop-color:#6f716c;stop-opacity:1;" />
+ <stop
+ id="stop3359"
+ offset="1"
+ style="stop-color:#888a85;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3355"
+ id="linearGradient3329"
+ x1="38.201752"
+ y1="41.542465"
+ x2="38.979862"
+ y2="44.494751"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3331">
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:1;"
+ offset="0"
+ id="stop3333" />
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:0;"
+ offset="1"
+ id="stop3335" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3331"
+ id="linearGradient3337"
+ x1="35.118725"
+ y1="40.170986"
+ x2="35.358002"
+ y2="45.698715"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient5354">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop5356" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop5358" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6288">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1"
+ offset="0"
+ id="stop6290" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1"
+ offset="1"
+ id="stop6292" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6288"
+ id="radialGradient8344"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.0249844,0,0,2.0992192,-9.3693601,0.8779019)"
+ cx="11.03125"
+ cy="11.49707"
+ fx="11.03125"
+ fy="11.49707"
+ r="10.96875" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5354"
+ id="linearGradient8346"
+ gradientUnits="userSpaceOnUse"
+ x1="18.119612"
+ y1="36.509514"
+ x2="18.119612"
+ y2="40.376373"
+ gradientTransform="matrix(0.9545455,0,0,1,1.0909091,0)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8358"
+ id="radialGradient8401"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.25,-4,-84.375)"
+ cx="1"
+ cy="37.5"
+ fx="1"
+ fy="37.5"
+ r="2" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8368"
+ id="linearGradient8403"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-1,0)"
+ x1="9"
+ y1="40"
+ x2="9"
+ y2="35" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8358"
+ id="radialGradient8405"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.25,44,-9.375)"
+ cx="1"
+ cy="37.5"
+ fx="1"
+ fy="37.5"
+ r="2" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6380"
+ id="radialGradient6386"
+ cx="17.48214"
+ cy="8.3041525"
+ fx="17.48214"
+ fy="8.3041525"
+ r="21"
+ gradientTransform="matrix(-3.2870561,0,0,1.48151,69.675557,4.9698439)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="45.935744"
+ inkscape:cy="26.871495"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="48px"
+ height="48px"
+ inkscape:showpageshadow="false"
+ gridspacingx="0.5px"
+ gridspacingy="0.5px"
+ gridempspacing="2"
+ showgrid="false"
+ inkscape:window-width="1003"
+ inkscape:window-height="696"
+ inkscape:window-x="322"
+ inkscape:window-y="144"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ showborder="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6113" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Lapo Calamandrei</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Livello 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g8396"
+ style="opacity:0.3"
+ transform="matrix(1.0217391,0,0,1.1,-0.5217391,-4)">
+ <rect
+ style="opacity:1;fill:url(#radialGradient8401);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ id="rect8348"
+ width="2"
+ height="5"
+ x="-3"
+ y="-40"
+ transform="scale(-1,-1)" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient8403);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ id="rect8366"
+ width="42"
+ height="5"
+ x="3"
+ y="35" />
+ <rect
+ style="opacity:1;fill:url(#radialGradient8405);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ id="rect8390"
+ width="2"
+ height="5"
+ x="45"
+ y="35" />
+ </g>
+ <g
+ id="g8333"
+ transform="translate(0,-3)">
+ <rect
+ ry="2.0508666"
+ rx="2.0508666"
+ y="7.4990835"
+ x="2.5124066"
+ height="33.001831"
+ width="42.975185"
+ id="rect5317"
+ style="fill:url(#radialGradient8344);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999999999999996;stroke-opacity:1" />
+ <rect
+ ry="1.0764557"
+ rx="1.0764557"
+ y="8.5"
+ x="3.5000012"
+ height="31"
+ width="41"
+ id="rect6304"
+ style="opacity:0.45;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1" />
+ <rect
+ ry="1.0307201"
+ rx="1.0307201"
+ y="22.5"
+ x="13.5"
+ height="6"
+ width="20.999998"
+ id="rect6306"
+ style="fill:#ffffff;fill-opacity:1;stroke:#729fcf;stroke-width:0.99999987999999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999999999999996;stroke-opacity:1" />
+ <path
+ transform="matrix(1.1505466,0,0,1.1128235,7.7796609,12.403126)"
+ d="M 8.883029 11.769049 A 1.3037281 1.3479223 0 1 1 6.2755728,11.769049 A 1.3037281 1.3479223 0 1 1 8.883029 11.769049 z"
+ sodipodi:ry="1.3479223"
+ sodipodi:rx="1.3037281"
+ sodipodi:cy="11.769049"
+ sodipodi:cx="7.5793009"
+ id="path6308"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.1505466,0,0,1.1128235,11.779661,12.403126)"
+ d="M 8.883029 11.769049 A 1.3037281 1.3479223 0 1 1 6.2755728,11.769049 A 1.3037281 1.3479223 0 1 1 8.883029 11.769049 z"
+ sodipodi:ry="1.3479223"
+ sodipodi:rx="1.3037281"
+ sodipodi:cy="11.769049"
+ sodipodi:cx="7.5793009"
+ id="path5346"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.1505466,0,0,1.1128235,15.779661,12.403126)"
+ d="M 8.883029 11.769049 A 1.3037281 1.3479223 0 1 1 6.2755728,11.769049 A 1.3037281 1.3479223 0 1 1 8.883029 11.769049 z"
+ sodipodi:ry="1.3479223"
+ sodipodi:rx="1.3037281"
+ sodipodi:cy="11.769049"
+ sodipodi:cx="7.5793009"
+ id="path5348"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.1505466,0,0,1.1128235,19.779661,12.403126)"
+ d="M 8.883029 11.769049 A 1.3037281 1.3479223 0 1 1 6.2755728,11.769049 A 1.3037281 1.3479223 0 1 1 8.883029 11.769049 z"
+ sodipodi:ry="1.3479223"
+ sodipodi:rx="1.3037281"
+ sodipodi:cy="11.769049"
+ sodipodi:cx="7.5793009"
+ id="path5350"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <rect
+ ry="0"
+ rx="0"
+ y="36"
+ x="3"
+ height="5"
+ width="42"
+ id="rect5352"
+ style="opacity:0.6561086;fill:url(#linearGradient8346);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999999999999996;stroke-opacity:1" />
+ <rect
+ ry="0.5"
+ rx="0.5"
+ y="20"
+ x="13"
+ height="1"
+ width="12"
+ id="rect6331"
+ style="opacity:0.06896554;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1;opacity:0.11206897"
+ d="M 32.03125 26 C 31.361036 26.040205 30.708288 26.148665 30.0625 26.375 C 29.967283 26.401782 29.880485 26.470663 29.84375 26.5625 C 29.807015 26.654337 29.824521 26.758689 29.875 26.84375 C 29.892825 26.867389 29.913861 26.888425 29.9375 26.90625 L 34.25 31.21875 L 32.96875 33.75 L 30.4375 35.0625 L 26.125 30.75 C 26.11532 30.738872 26.104878 30.72843 26.09375 30.71875 C 26.011369 30.654298 25.912336 30.625051 25.8125 30.65625 C 25.712664 30.687448 25.624774 30.775109 25.59375 30.875 C 24.745566 33.26401 25.196751 35.974825 26.90625 38 L 41.90625 38 L 39.4375 35.53125 C 40.249195 33.001254 39.660868 30.129618 37.65625 28.125 C 36.116147 26.584897 34.04771 25.879036 32.03125 26 z "
+ id="path8417" />
+ <g
+ style="display:inline"
+ id="g3302"
+ transform="matrix(0.707107,-0.707107,0.707107,0.707107,-14.178071,34.842537)">
+ <path
+ inkscape:transform-center-y="4.25"
+ sodipodi:nodetypes="csccccsccccc"
+ id="path2343"
+ d="M 32.5,24.1875 C 30.13715,25.312159 28.5,27.710447 28.5,30.5 C 28.5,33.289555 30.137147,35.687838 32.5,36.8125 L 32.5,52.52167 L 38.53125,52.52167 L 38.53125,36.8125 C 40.880361,35.682677 42.5,33.279516 42.5,30.5 C 42.5,27.720486 40.880357,25.31732 38.53125,24.1875 L 38.53125,30.5 L 35.515625,31.5 L 32.5,30.5 L 32.5,24.1875 z "
+ style="opacity:1;color:#000000;fill:url(#linearGradient3337);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3329);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cssccccsscccccccc"
+ id="path3297"
+ d="M 31.5,26.34375 C 30.359137,27.432066 29.5,28.792056 29.5,30.5 C 29.5,32.900502 30.909032,34.940748 32.9375,35.90625 C 33.284845,36.073728 33.504061,36.426909 33.5,36.8125 L 33.5,51.499573 L 37.53125,51.499573 L 37.53125,36.8125 C 37.527189,36.426909 37.746405,36.073728 38.09375,35.90625 C 40.107408,34.937766 41.5,32.893233 41.5,30.5 C 41.5,28.802203 40.65724,27.433848 39.53125,26.34375 L 39.53125,30.5 C 39.527628,30.92786 39.250736,31.305441 38.84375,31.4375 L 35.8125,32.4375 C 35.60958,32.504668 35.39042,32.504668 35.1875,32.4375 L 32.1875,31.4375 C 31.780514,31.305441 31.503622,30.92786 31.5,30.5 L 31.5,26.34375 z "
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3321);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ ry="1.0000045"
+ rx="1.0000045"
+ y="37.499985"
+ x="34.500008"
+ height="15.000015"
+ width="2.0000091"
+ id="rect3300"
+ style="opacity:0.4;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3313);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <g
+ id="g8378" />
+ <path
+ style="opacity:0.5;fill:url(#radialGradient6386);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+ d="M 43.4375,5 C 44.309451,5 45,5.6905494 45,6.5625 L 45,14.09375 C 32.309747,22.283368 17.771002,26.209098 3,22.5625 L 3,6.5625 C 3,5.6905488 3.690549,5 4.5625,5 L 43.4375,5 z "
+ id="path6374" />
+ </g>
+</svg>
Added: desktop/experimental/gdm3/debian/patches/12_polkit_settings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/12_polkit_settings.patch?rev=23504&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/12_polkit_settings.patch (added)
+++ desktop/experimental/gdm3/debian/patches/12_polkit_settings.patch [utf-8] Thu Apr 1 19:18:39 2010
@@ -1,0 +1,246 @@
+Update in Debian:
+- Do not create an Unlock method.
+- Do a sync non-user-interactive authorization check for SetValue only.
+- More checks and memory management.
+- Call action org.gnome.displaymanager.settings.set instead of .write, .set
+ is more used in other actions.
+
+--- a/common/gdm-settings.c
++++ b/common/gdm-settings.c
+@@ -36,6 +36,7 @@
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
++#include <polkit/polkit.h>
+
+ #include "gdm-settings.h"
+ #include "gdm-settings-glue.h"
+@@ -118,23 +119,66 @@
+ gdm_settings_set_value (GdmSettings *settings,
+ const char *key,
+ const char *value,
+- GError **error)
++ DBusGMethodInvocation *context)
+ {
+- GError *local_error;
++ PolkitAuthority *authority;
++ PolkitSubject *subject;
++ PolkitAuthorizationResult *result;
++ char *sender;
++ GError *error;
+ gboolean res;
+
+ g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
+ g_return_val_if_fail (key != NULL, FALSE);
+
++ authority = NULL;
++ sender = NULL;
++ result = NULL;
++ error = NULL;
++
+ g_debug ("Setting value %s", key);
+
+- local_error = NULL;
++ authority = polkit_authority_get ();
++ sender = dbus_g_method_get_sender (context);
++ if (!sender) {
++ g_debug ("GdmSettings: Can't determinate sender");
++ goto out;
++ }
++
++ subject = polkit_system_bus_name_new (sender);
++ result = polkit_authority_check_authorization_sync (authority, subject, "org.gnome.displaymanager.settings.set",
++ NULL,
++ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
++ NULL, &error);
++ if (!result) {
++ if (error) {
++ g_debug ("GdmSettings: Error occurred during authorization: %s", error->message);
++ }
++ goto out;
++ }
++
++ res = polkit_authorization_result_get_is_authorized (result);
++ if (!res) {
++ g_debug ("GdmSettings: Client unauthorized, bailing out");
++ goto out;
++ }
++
+ res = gdm_settings_backend_set_value (settings->priv->backend,
+ key,
+ value,
+- &local_error);
+- if (! res) {
+- g_propagate_error (error, local_error);
++ &error);
++
++ out:
++ g_object_unref (authority);
++ g_object_unref (subject);
++ g_object_unref (result);
++ g_free (sender);
++
++ if (res) {
++ dbus_g_method_return (context);
++ } else {
++ dbus_g_method_return_error (context, error);
++ g_error_free (error);
+ }
+
+ return res;
+--- a/common/gdm-settings.h
++++ b/common/gdm-settings.h
+@@ -23,6 +23,7 @@
+ #define __GDM_SETTINGS_H
+
+ #include <glib-object.h>
++#include <dbus/dbus-glib.h>
+
+ G_BEGIN_DECLS
+
+@@ -73,7 +74,7 @@
+ gboolean gdm_settings_set_value (GdmSettings *settings,
+ const char *key,
+ const char *value,
+- GError **error);
++ DBusGMethodInvocation *context);
+
+ G_END_DECLS
+
+--- a/common/gdm-settings.xml
++++ b/common/gdm-settings.xml
+@@ -6,6 +6,7 @@
+ <arg name="value" direction="out" type="s"/>
+ </method>
+ <method name="SetValue">
++ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg name="key" direction="in" type="s"/>
+ <arg name="value" direction="in" type="s"/>
+ </method>
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@
+ dnl ---------------------------------------------------------------------------
+
+ DBUS_GLIB_REQUIRED_VERSION=0.74
++POLKIT_GOBJECT_REQUIRED_VERSION=0.92
+ GLIB_REQUIRED_VERSION=2.22.0
+ GTK_REQUIRED_VERSION=2.12.0
+ PANGO_REQUIRED_VERSION=1.3.0
+@@ -60,6 +61,7 @@
+
+ PKG_CHECK_MODULES(COMMON,
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+@@ -68,6 +70,7 @@
+
+ PKG_CHECK_MODULES(DAEMON,
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+@@ -1392,6 +1395,7 @@
+ gui/user-switch-applet/Makefile
+ utils/Makefile
+ data/gdm.conf
++data/gdm.policy
+ data/Makefile
+ data/faces/Makefile
+ data/greeter-autostart/Makefile
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -46,6 +46,8 @@
+ schemas_in_files = gdm.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
++ at INTLTOOL_POLICY_RULE@
++
+ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
+ sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
+ -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
+@@ -78,11 +80,18 @@
+ localealiasdir = $(datadir)/gdm
+ localealias_DATA = locale.alias
+
++polkitdir = $(datadir)/polkit-1/actions
++polkit_in_files = gdm.policy.in
++polkit_DATA = $(polkit_in_files:.policy.in=.policy)
++check:
++ $(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
++
+ EXTRA_DIST = \
+ $(schemas_in_files) \
+ $(schemas_DATA) \
+ $(dbusconf_in_files) \
+ $(localealias_DATA) \
++ $(polkit_in_files) \
+ gdm.schemas.in.in \
+ gdm.conf-custom.in \
+ Xsession.in \
+@@ -105,7 +114,8 @@
+ $(NULL)
+
+ DISTCLEANFILES = \
+- $(dbusconf_DATA) \
++ $(dbusconf_DATA) \
++ $(polkit_DATA) \
+ gdm.schemas \
+ $(NULL)
+
+--- a/data/gdm.conf.in
++++ b/data/gdm.conf.in
+@@ -34,8 +34,6 @@
+ <deny send_destination="org.gnome.DisplayManager"
+ send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+ <deny send_destination="org.gnome.DisplayManager"
+- send_interface="org.gnome.DisplayManager.Settings"/>
+- <deny send_destination="org.gnome.DisplayManager"
+ send_interface="org.gnome.DisplayManager.Slave"/>
+ <deny send_destination="org.gnome.DisplayManager"
+ send_interface="org.gnome.DisplayManager.Session"/>
+@@ -44,6 +42,10 @@
+ <allow send_destination="org.gnome.DisplayManager"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+
++ <!-- Controlled by Policykit -->
++ <allow send_destination="org.gnome.DisplayManager"
++ send_interface="org.gnome.DisplayManager.Settings"/>
++
+ <allow send_destination="org.gnome.DisplayManager"
+ send_interface="org.gnome.DisplayManager.Display"
+ send_member="GetId"/>
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -49,6 +49,7 @@
+ daemon/simple-slave-main.c
+ daemon/test-session.c
+ daemon/xdmcp-chooser-slave-main.c
++data/gdm.policy.in
+ data/gdm.schemas.in.in
+ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
+ data/greeter-autostart/gdm-simple-greeter.desktop.in.in
+--- /dev/null
++++ b/data/gdm.policy.in
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE policyconfig PUBLIC
++ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
++<policyconfig>
++ <vendor>The GNOME Project</vendor>
++ <vendor_url>http://www.gnome.org/</vendor_url>
++ <icon_name>gdm</icon_name>
++
++ <action id="org.gnome.displaymanager.settings.set">
++ <_description>Change login screen configuration</_description>
++ <_message>Privileges are required to change the login screen configuration.</_message>
++ <defaults>
++ <allow_inactive>no</allow_inactive>
++ <allow_active>auth_admin_keep</allow_active>
++ </defaults>
++ </action>
++</policyconfig>
Added: desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch?rev=23504&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch (added)
+++ desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Thu Apr 1 19:18:39 2010
@@ -1,0 +1,774 @@
+Update in Debian:
+- Get rid of sessions, they're chosen in the greeter.
+- Get rid of sound and face browser, they are not gdm options.
+- Get rid of dbus, use GdmSettingsClient instead.
+- Use libgdmuser of simple-greeter instead of copying gdm-user* code.
+- Use PolkitLockButton.
+
+# Description: Add GDM Setup
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=587750
+#
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,6 +41,7 @@
+
+ DBUS_GLIB_REQUIRED_VERSION=0.74
+ POLKIT_GOBJECT_REQUIRED_VERSION=0.92
++POLKIT_GTK_REQUIRED_VERSION=0.92
+ GLIB_REQUIRED_VERSION=2.22.0
+ GTK_REQUIRED_VERSION=2.12.0
+ PANGO_REQUIRED_VERSION=1.3.0
+@@ -118,6 +119,14 @@
+ AC_SUBST(DEVKIT_POWER_CFLAGS)
+ AC_SUBST(DEVKIT_POWER_LIBS)
+
++PKG_CHECK_MODULES(GDMSETUP,
++ polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++)
++AC_SUBST(GDMSETUP_CFLAGS)
++AC_SUBST(GDMSETUP_LIBS)
++
+ PKG_CHECK_MODULES(SIMPLE_GREETER,
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gtk+-2.0 >= $GTK_REQUIRED_VERSION
+@@ -1389,6 +1398,7 @@
+ daemon/Makefile
+ docs/Makefile
+ gui/Makefile
++gui/gdmsetup/Makefile
+ gui/simple-greeter/Makefile
+ gui/simple-greeter/libnotificationarea/Makefile
+ gui/simple-chooser/Makefile
+--- /dev/null
++++ b/gui/gdmsetup/gdmsetup.c
+@@ -0,0 +1,370 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <string.h>
++#include <stdlib.h>
++#include <gtk/gtk.h>
++#include <gdk/gdkkeysyms.h>
++#include <polkitgtk/polkitgtk.h>
++#include <glib/gi18n.h>
++
++#include "gdm-user-manager.h"
++#include "gdm-settings-client.h"
++#include "gdm-settings-keys.h"
++
++#define MAX_USERS_IN_COMBO_BOX 20
++
++/* User interface */
++static GtkBuilder *ui;
++static GtkWidget *dialog, *unlock_button, *option_vbox;
++static GtkWidget *user_combo, *user_entry, *delay_spin;
++static GtkWidget *auto_login_radio, *login_delay_box, *login_delay_check;
++
++/* Timer to delay application of configuration */
++static guint apply_timeout = 0;
++
++/* Flag to show when information is user_login_loaded */
++static gboolean user_login_loaded = FALSE;
++
++/* Flag to show when user is authorized to change settings */
++static gboolean authorized = FALSE;
++
++/* True if the user selection method is a combo box, False if an entry */
++static gboolean user_list_is_combo = TRUE;
++
++/* User information */
++static GdmUserManager *user_manager;
++
++static void
++update_config ()
++{
++ GtkTreeModel *model;
++ GtkTreeIter iter;
++ gchar *user = NULL;
++ gint delay = 0;
++ gboolean auto_login = FALSE, timed_login = FALSE, error = FALSE;
++
++ if (apply_timeout != 0) {
++ g_source_remove (apply_timeout);
++ apply_timeout = 0;
++ }
++
++ if (user_list_is_combo) {
++ model = gtk_combo_box_get_model (GTK_COMBO_BOX (user_combo));
++ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (user_combo), &iter))
++ gtk_tree_model_get (model, &iter, 1, &user, -1);
++ }
++ else
++ user = g_strdup (gtk_entry_get_text (GTK_ENTRY (user_entry)));
++
++ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (auto_login_radio))) {
++ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (login_delay_check)))
++ timed_login = TRUE;
++ else
++ auto_login = TRUE;
++ }
++
++ delay = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (delay_spin));
++
++ g_debug ("set user='%s', auto=%s, timed=%s, delay=%d",
++ user,
++ auto_login ? "True" : "False",
++ timed_login ? "True" : "False", delay);
++
++ if (!gdm_settings_client_set_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, timed_login) ||
++ !gdm_settings_client_set_boolean (GDM_KEY_AUTO_LOGIN_ENABLE, auto_login) ||
++ !gdm_settings_client_set_string (GDM_KEY_TIMED_LOGIN_USER, user) ||
++ !gdm_settings_client_set_string (GDM_KEY_AUTO_LOGIN_USER, user) ||
++ !gdm_settings_client_set_int (GDM_KEY_TIMED_LOGIN_DELAY, delay))
++ error = TRUE;
++
++ if (user)
++ g_free (user);
++}
++
++
++G_MODULE_EXPORT
++void
++gdm_capplet_response_cb (GtkWidget *widget, gint response_id)
++{
++ if (response_id != 1)
++ gtk_main_quit ();
++}
++
++
++static void
++unlock_changed (PolkitLockButton *button,
++ void *user_data)
++{
++ authorized = polkit_lock_button_get_is_authorized (button);
++ gtk_widget_set_sensitive (option_vbox, user_login_loaded && authorized);
++}
++
++
++G_MODULE_EXPORT
++void
++login_delay_check_toggled_cb (GtkWidget *widget)
++{
++ gtk_widget_set_sensitive (delay_spin,
++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (login_delay_check)));
++
++ if (user_login_loaded)
++ update_config ();
++}
++
++static gboolean
++delayed_apply_cb ()
++{
++ update_config ();
++ return FALSE;
++}
++
++G_MODULE_EXPORT
++void
++apply_config_cb (GtkWidget *widget)
++{
++ if (user_login_loaded) {
++ if (apply_timeout != 0)
++ g_source_remove (apply_timeout);
++ apply_timeout = g_timeout_add (200, (GSourceFunc)delayed_apply_cb, NULL);
++ }
++}
++
++
++static void
++init_login_delay ()
++{
++ gint delay;
++ gboolean timed_login_enable;
++
++ if (gdm_settings_client_get_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, &timed_login_enable))
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (login_delay_check), timed_login_enable);
++ else
++ g_warning ("Unable to get setting " GDM_KEY_TIMED_LOGIN_ENABLE);
++
++ if (!gdm_settings_client_get_int (GDM_KEY_TIMED_LOGIN_DELAY, &delay))
++ g_warning ("Unable to get setting " GDM_KEY_TIMED_LOGIN_DELAY);
++
++ g_debug ("init delay=%d", delay);
++
++ gtk_spin_button_set_value (GTK_SPIN_BUTTON (delay_spin), delay);
++}
++
++
++G_MODULE_EXPORT
++void
++automatic_login_toggle_cb (GtkWidget *automatic_login_toggle)
++{
++ gboolean automatic_login;
++
++ automatic_login = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (automatic_login_toggle));
++ gtk_widget_set_sensitive (login_delay_box, automatic_login);
++ gtk_widget_set_sensitive (user_combo, automatic_login);
++ gtk_widget_set_sensitive (user_entry, automatic_login);
++
++ if (user_login_loaded)
++ update_config ();
++}
++
++
++G_MODULE_EXPORT
++void
++default_user_combo_box_changed_cb (void)
++{
++ if (user_login_loaded) {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (auto_login_radio), TRUE);
++ update_config ();
++ }
++}
++
++static void
++init_default_user (void)
++{
++ GtkTreeModel *model;
++ GtkTreeIter iter;
++ gboolean auto_login, timed_login, active;
++ gchar *user = NULL;
++
++ if (!gdm_settings_client_get_boolean (GDM_KEY_AUTO_LOGIN_ENABLE, &auto_login))
++ g_warning ("Unable to get setting " GDM_KEY_AUTO_LOGIN_ENABLE);
++ if (!gdm_settings_client_get_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, &timed_login))
++ g_warning ("Unable to get setting " GDM_KEY_TIMED_LOGIN_ENABLE);
++
++ if (auto_login)
++ gdm_settings_client_get_string (GDM_KEY_AUTO_LOGIN_USER, &user);
++ if (user == NULL)
++ gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, &user);
++
++ g_debug ("init user='%s' auto=%s", user, auto_login || timed_login ? "True" : "False");
++
++ if (auto_login || timed_login)
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (auto_login_radio), TRUE);
++
++ if (!user_list_is_combo) {
++ if (user != NULL)
++ gtk_entry_set_text (GTK_ENTRY (user_entry), user);
++ }
++ else {
++ model = gtk_combo_box_get_model (GTK_COMBO_BOX (user_combo));
++ active = gtk_tree_model_get_iter_first (model, &iter);
++
++ /* If no user then use first available */
++ if (user == NULL) {
++ if (active)
++ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (user_combo), &iter);
++ }
++ else {
++ while (user != NULL && active) {
++ gchar *u;
++ gboolean matched;
++
++ gtk_tree_model_get (model, &iter, 1, &u, -1);
++ matched = strcmp (user, u) == 0;
++ g_free (u);
++ if (matched) {
++ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (user_combo), &iter);
++ break;
++ }
++
++ active = gtk_tree_model_iter_next (model, &iter);
++ }
++ }
++ }
++
++ g_free (user);
++}
++
++static void add_user (GdmUser *user)
++{
++ GtkListStore *model;
++ GtkTreeIter iter;
++ GString *label;
++
++ model = GTK_LIST_STORE (gtk_builder_get_object (ui, "login_user_model"));
++ gtk_list_store_append (model, &iter);
++ label = g_string_new("");
++ g_string_printf (label, "%s (%s)", gdm_user_get_real_name (user), gdm_user_get_user_name (user));
++ gtk_list_store_set (model, &iter,
++ 0, label->str,
++ 1, gdm_user_get_user_name (user),
++ -1);
++ g_string_free (label, TRUE);
++}
++
++
++static void
++users_loaded_cb(GdmUserManager *manager)
++{
++ GSList *users, *item;
++
++ users = gdm_user_manager_list_users (user_manager);
++
++ if (g_slist_length (users) > MAX_USERS_IN_COMBO_BOX) {
++ user_list_is_combo = FALSE;
++ gtk_widget_hide (user_combo);
++ gtk_widget_show (user_entry);
++ }
++ else {
++ for (item = users; item; item = item->next)
++ add_user ((GdmUser *) item->data);
++ }
++
++ init_default_user ();
++
++ user_login_loaded = TRUE;
++ gtk_widget_set_sensitive (option_vbox, user_login_loaded && authorized);
++}
++
++
++static void
++user_added_cb (GdmUserManager *manager, GdmUser *user)
++{
++ if (user_login_loaded)
++ add_user (user);
++}
++
++static void
++split_text (const gchar *text, const gchar *prefix_label_name, const gchar *suffix_label_name)
++{
++ gchar **tokens;
++ GtkWidget *prefix_label, *suffix_label;
++
++ prefix_label = GTK_WIDGET (gtk_builder_get_object (ui, prefix_label_name));
++ suffix_label = GTK_WIDGET (gtk_builder_get_object (ui, suffix_label_name));
++
++ tokens = g_strsplit (text, "%s", 2);
++ if (tokens[0] != NULL && tokens[1] != NULL) {
++ if (tokens[0][0] != '\0')
++ gtk_label_set_text (GTK_LABEL (prefix_label), g_strstrip (tokens[0]));
++ else
++ gtk_widget_hide (prefix_label);
++ if (tokens[1][0] != '\0')
++ gtk_label_set_text (GTK_LABEL (suffix_label), g_strstrip (tokens[1]));
++ else
++ gtk_widget_hide (suffix_label);
++ }
++ g_strfreev (tokens);
++}
++
++
++int main (int argc, char **argv)
++{
++ GtkCellRenderer *renderer;
++ GError *error = NULL;
++
++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++ textdomain (GETTEXT_PACKAGE);
++
++ gtk_init (&argc, &argv);
++
++ if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/"))
++ g_error ("Unable to initialize settings client");
++
++ ui = gtk_builder_new ();
++ gtk_builder_add_from_file (ui, UIDIR "/gdmsetup.ui", &error);
++ if (error)
++ g_error ("Failed to load UI: %s", error->message);
++
++ dialog = GTK_WIDGET (gtk_builder_get_object (ui, "gdm_capplet"));
++ option_vbox = GTK_WIDGET (gtk_builder_get_object (ui, "gdm_capplet_vbox"));
++ user_combo = GTK_WIDGET (gtk_builder_get_object (ui, "default_user_combo_box"));
++ user_entry = GTK_WIDGET (gtk_builder_get_object (ui, "default_user_entry"));
++ delay_spin = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_spin"));
++ auto_login_radio = GTK_WIDGET (gtk_builder_get_object (ui, "automatic_login_radio"));
++ login_delay_box = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_box"));
++ login_delay_check = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_check"));
++
++ gtk_builder_connect_signals (ui, NULL);
++
++ /* unlock button */
++ unlock_button = GTK_WIDGET (polkit_lock_button_new ("org.gnome.displaymanager.settings.set"));
++ gtk_widget_show (unlock_button);
++ gtk_box_pack_start_defaults (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), unlock_button);
++ g_signal_connect (unlock_button, "changed", G_CALLBACK (unlock_changed), NULL);
++
++ /* Translators: Label for choosing which user to log in as. '%s' is replaced with an input field. */
++ split_text (_("Log in as %s automatically"), "user_prefix_label", "user_suffix_label");
++ /* Translators: Label for choosing the login delay. '%s' is replaced with an input field. */
++ split_text (_("Allow %s seconds for anyone else to log in first"), "delay_prefix_label", "delay_suffix_label");
++
++ init_login_delay ();
++
++ renderer = gtk_cell_renderer_text_new ();
++ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (user_combo), renderer, TRUE);
++ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "text", 0);
++
++ user_manager = gdm_user_manager_ref_default ();
++ g_signal_connect (user_manager, "users-loaded", G_CALLBACK (users_loaded_cb), NULL);
++ g_signal_connect (user_manager, "user-added", G_CALLBACK (user_added_cb), NULL);
++
++ gtk_widget_hide (user_entry);
++
++ gtk_widget_set_sensitive (option_vbox, FALSE);
++ gtk_widget_show (dialog);
++
++ gtk_main ();
++
++ return 0;
++}
+--- /dev/null
++++ b/gui/gdmsetup/gdmsetup.desktop.in
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Login Screen
++_Comment=Configure login screen behavior
++Exec=gdmsetup
++Icon=gdmsetup
++StartupNotify=true
++Terminal=false
++Type=Application
++Categories=GNOME;GTK;Settings;System;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gdm
++X-GNOME-Bugzilla-Component=general
+--- /dev/null
++++ b/gui/gdmsetup/gdmsetup.ui
+@@ -0,0 +1,271 @@
++<?xml version="1.0"?>
++<interface>
++ <requires lib="gtk+" version="2.16"/>
++ <!-- interface-naming-policy project-wide -->
++ <object class="GtkListStore" id="login_user_model">
++ <columns>
++ <!-- column-name label -->
++ <column type="gchararray"/>
++ <!-- column-name user -->
++ <column type="gchararray"/>
++ <!-- column-name icon -->
++ <column type="GdkPixbuf"/>
++ </columns>
++ </object>
++ <object class="GtkDialog" id="gdm_capplet">
++ <property name="border_width">5</property>
++ <property name="title" translatable="yes" comments="Title of login screen settings dialog">Login Screen Settings</property>
++ <property name="resizable">False</property>
++ <property name="window_position">center</property>
++ <property name="icon_name">gdm-setup</property>
++ <property name="type_hint">normal</property>
++ <property name="has_separator">False</property>
++ <signal name="response" handler="gdm_capplet_response_cb"/>
++ <child internal-child="vbox">
++ <object class="GtkVBox" id="dialog-vbox1">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkFrame" id="frame2">
++ <property name="visible">True</property>
++ <property name="label_xalign">0</property>
++ <property name="shadow_type">none</property>
++ <child>
++ <object class="GtkAlignment" id="alignment2">
++ <property name="visible">True</property>
++ <property name="left_padding">12</property>
++ <child>
++ <object class="GtkVBox" id="gdm_capplet_vbox">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkVBox" id="vbox3">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkVBox" id="vbox1">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkRadioButton" id="manual_login_radio">
++ <property name="label" translatable="yes" comments="Radio option to set login screen to prompt for user">_Show the screen for choosing who will log in</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="use_underline">True</property>
++ <property name="active">True</property>
++ <property name="draw_indicator">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkVBox" id="vbox4">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkHBox" id="hbox1">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkRadioButton" id="automatic_login_radio">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="draw_indicator">True</property>
++ <property name="group">manual_login_radio</property>
++ <signal name="toggled" handler="automatic_login_toggle_cb"/>
++ <child>
++ <object class="GtkLabel" id="user_prefix_label">
++ <property name="visible">True</property>
++ <property name="label">_Log in as</property>
++ <property name="use_underline">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkComboBox" id="default_user_combo_box">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="model">login_user_model</property>
++ <signal name="changed" handler="default_user_combo_box_changed_cb"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry" id="default_user_entry">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="apply_config_cb"/>
++ </object>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="user_suffix_label">
++ <property name="visible">True</property>
++ <property name="label">automatically</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkAlignment" id="alignment1">
++ <property name="visible">True</property>
++ <property name="left_padding">16</property>
++ <child>
++ <object class="GtkHBox" id="login_delay_box">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkCheckButton" id="login_delay_check">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="draw_indicator">True</property>
++ <signal name="toggled" handler="login_delay_check_toggled_cb"/>
++ <child>
++ <object class="GtkLabel" id="delay_prefix_label">
++ <property name="visible">True</property>
++ <property name="label">_Allow</property>
++ <property name="use_underline">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinButton" id="login_delay_spin">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="invisible_char">•</property>
++ <property name="adjustment">adjustment1</property>
++ <signal name="value_changed" handler="apply_config_cb"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="delay_suffix_label">
++ <property name="visible">True</property>
++ <property name="label">seconds for anyone else to log in first</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ </child>
++ <child type="label">
++ <object class="GtkLabel" id="label2">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes"><b>When the computer starts up</b></property>
++ <property name="use_markup">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child internal-child="action_area">
++ <object class="GtkHButtonBox" id="dialog-action_area1">
++ <property name="visible">True</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="close_button">
++ <property name="label">gtk-close</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ <action-widgets>
++ <action-widget response="-7">close_button</action-widget>
++ </action-widgets>
++ </object>
++ <object class="GtkSizeGroup" id="combo_size_group"/>
++ <object class="GtkSizeGroup" id="radio_size_group"/>
++ <object class="GtkAdjustment" id="adjustment1">
++ <property name="lower">1</property>
++ <property name="upper">600</property>
++ <property name="step_increment">1</property>
++ </object>
++</interface>
+--- /dev/null
++++ b/gui/gdmsetup/Makefile.am
+@@ -0,0 +1,42 @@
++NULL =
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/common \
++ -I$(top_srcdir)/gui/simple-greeter \
++ -DGDMCONFDIR=\"$(gdmconfdir)\" \
++ -DDMCONFDIR=\""$(dmconfdir)"\" \
++ -DDATADIR=\""$(datadir)"\" \
++ -DUIDIR=\""$(uidir)"\" \
++ -DGNOMELOCALEDIR=\""$(gdmlocaledir)"\" \
++ $(DISABLE_DEPRECATED_CFLAGS) \
++ $(GDMSETUP_CFLAGS) \
++ $(NULL)
++
++bin_PROGRAMS = \
++ gdmsetup \
++ $(NULL)
++
++gdmsetup_SOURCES = \
++ gdmsetup.c \
++ $(NULL)
++
++gdmsetup_LDADD = \
++ $(top_builddir)/common/libgdmcommon.la \
++ $(top_builddir)/gui/simple-greeter/libgdmuser.la \
++ $(GDMSETUP_LIBS) \
++ $(NULL)
++
++uidir = $(pkgdatadir)
++ui_DATA = \
++ gdmsetup.ui \
++ $(NULL)
++
++Systemdir = $(datadir)/applications
++System_in_files = gdmsetup.desktop.in
++System_DATA = $(System_in_files:.desktop.in=.desktop)
++ at INTLTOOL_DESKTOP_RULE@
++
++EXTRA_DIST = \
++ $(ui_DATA) \
++ $(System_in_files) \
++ $(NULL)
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -4,4 +4,5 @@
+ simple-chooser \
+ simple-greeter \
+ user-switch-applet \
++ gdmsetup \
+ $(NULL)
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -60,6 +60,9 @@
+ data/greeter-autostart/metacity.desktop.in
+ data/greeter-autostart/orca-screen-reader.desktop.in
+ data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
++gui/gdmsetup/gdmsetup.desktop.in
++gui/gdmsetup/gdmsetup.c
++[type: gettext/glade]gui/gdmsetup/gdmsetup.ui
+ gui/simple-chooser/gdm-host-chooser-dialog.c
+ gui/simple-chooser/gdm-host-chooser-widget.c
+ gui/simple-greeter/gdm-cell-renderer-timer.c
Modified: desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch [utf-8] Thu Apr 1 19:18:39 2010
@@ -9682,7 +9682,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -191,8 +229,7 @@
+@@ -191,18 +229,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -9692,7 +9692,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -203,6 +240,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -9700,7 +9705,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -234,6 +272,7 @@
+@@ -234,6 +274,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -9708,7 +9713,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -243,6 +282,7 @@
+@@ -243,6 +284,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -9716,7 +9721,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -253,13 +293,19 @@
+@@ -253,13 +295,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -9736,7 +9741,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -273,6 +319,7 @@
+@@ -273,6 +321,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -9744,7 +9749,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -311,7 +358,7 @@
+@@ -311,7 +360,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -9753,7 +9758,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -347,6 +394,7 @@
+@@ -347,6 +396,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -9761,7 +9766,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -511,14 +559,14 @@
+@@ -511,14 +561,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -9781,7 +9786,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -536,6 +584,7 @@
+@@ -536,6 +586,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9789,7 +9794,7 @@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -546,54 +595,71 @@
+@@ -546,54 +597,71 @@
rm -f "$${dir}/so_locations"; \
done
libgdmcommon.la: $(libgdmcommon_la_OBJECTS) $(libgdmcommon_la_DEPENDENCIES)
@@ -9891,7 +9896,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -622,141 +688,161 @@
+@@ -622,141 +690,161 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-settings-server.Po at am__quote@
.c.o:
@@ -10108,7 +10113,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdm-crash-logger.c' object='gdm_crash_logger-gdm-crash-logger.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gdm_crash_logger_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gdm_crash_logger-gdm-crash-logger.obj `if test -f 'gdm-crash-logger.c'; then $(CYGPATH_W) 'gdm-crash-logger.c'; else $(CYGPATH_W) '$(srcdir)/gdm-crash-logger.c'; fi`
-@@ -769,65 +855,72 @@
+@@ -769,65 +857,72 @@
install-gdmDATA: $(gdm_DATA)
@$(NORMAL_INSTALL)
test -z "$(gdmdir)" || $(MKDIR_P) "$(DESTDIR)$(gdmdir)"
@@ -10206,7 +10211,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -848,13 +941,17 @@
+@@ -848,13 +943,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -10228,7 +10233,7 @@
|| exit 1; \
fi; \
done
-@@ -888,6 +985,7 @@
+@@ -888,6 +987,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -10236,7 +10241,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -910,6 +1008,8 @@
+@@ -910,6 +1010,8 @@
html: html-am
@@ -10245,7 +10250,7 @@
info: info-am
info-am:
-@@ -918,18 +1018,28 @@
+@@ -918,18 +1020,28 @@
install-dvi: install-dvi-am
@@ -10274,7 +10279,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -952,7 +1062,7 @@
+@@ -952,7 +1064,7 @@
uninstall-am: uninstall-gdmDATA uninstall-libexecPROGRAMS
@@ -10283,7 +10288,7 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \
-@@ -980,6 +1090,7 @@
+@@ -980,6 +1092,7 @@
gdm-marshal.h: gdm-marshal.list
@GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --header > $@
@@ -12342,7 +12347,16 @@
PAM_PREFIX
GDM_GROUPNAME
GDM_USERNAME
-@@ -958,15 +914,23 @@
+@@ -884,6 +840,8 @@
+ LIBXKLAVIER_CFLAGS
+ SIMPLE_GREETER_LIBS
+ SIMPLE_GREETER_CFLAGS
++GDMSETUP_LIBS
++GDMSETUP_CFLAGS
+ HAVE_DEVICEKIT_POWER
+ DEVKIT_POWER_LIBS
+ DEVKIT_POWER_CFLAGS
+@@ -958,15 +916,23 @@
INTLTOOL_MERGE
INTLTOOL_UPDATE
USE_NLS
@@ -12371,7 +12385,7 @@
host_os
host_vendor
host_cpu
-@@ -975,6 +939,7 @@
+@@ -975,6 +941,7 @@
build_vendor
build_cpu
build
@@ -12379,7 +12393,7 @@
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
-@@ -1003,6 +968,8 @@
+@@ -1003,6 +970,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -12388,7 +12402,7 @@
am__untar
am__tar
AMTAR
-@@ -1056,6 +1023,7 @@
+@@ -1056,6 +1025,7 @@
program_transform_name
prefix
exec_prefix
@@ -12396,7 +12410,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1066,15 +1034,15 @@
+@@ -1066,15 +1036,15 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -12414,7 +12428,7 @@
enable_nls
with_help_dir
with_omf_dir
-@@ -1103,6 +1071,7 @@
+@@ -1103,6 +1073,7 @@
with_user
with_group
with_pam_prefix
@@ -12422,7 +12436,7 @@
with_dbus_sys
with_dbus_services
enable_rbac_shutdown
-@@ -1133,8 +1102,6 @@
+@@ -1133,8 +1104,6 @@
CXXFLAGS
CCC
CXXCPP
@@ -12431,7 +12445,16 @@
PKG_CONFIG
GTHREAD_CFLAGS
GTHREAD_LIBS
-@@ -1271,8 +1238,7 @@
+@@ -1153,6 +1122,8 @@
+ GCONF_LIBS
+ DEVKIT_POWER_CFLAGS
+ DEVKIT_POWER_LIBS
++GDMSETUP_CFLAGS
++GDMSETUP_LIBS
+ SIMPLE_GREETER_CFLAGS
+ SIMPLE_GREETER_LIBS
+ LIBXKLAVIER_CFLAGS
+@@ -1271,8 +1242,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 &&
@@ -12441,7 +12464,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1298,8 +1264,7 @@
+@@ -1298,8 +1268,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 &&
@@ -12451,7 +12474,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1503,8 +1468,7 @@
+@@ -1503,8 +1472,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 &&
@@ -12461,7 +12484,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1520,8 +1484,7 @@
+@@ -1520,8 +1488,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 &&
@@ -12471,7 +12494,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1551,17 +1514,17 @@
+@@ -1551,17 +1518,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -12495,7 +12518,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1578,15 +1541,13 @@
+@@ -1578,15 +1545,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -12513,7 +12536,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1609,8 +1570,7 @@
+@@ -1609,8 +1574,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -12523,7 +12546,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1640,11 +1600,9 @@
+@@ -1640,11 +1604,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -12537,7 +12560,7 @@
# Find the source files, if location was not specified.
-@@ -1683,13 +1641,11 @@
+@@ -1683,13 +1645,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -12553,7 +12576,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1797,6 +1753,8 @@
+@@ -1797,6 +1757,8 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -12562,7 +12585,7 @@
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--disable-dependency-tracking speeds up one-time build
-@@ -1828,10 +1786,9 @@
+@@ -1828,10 +1790,9 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -12574,7 +12597,7 @@
--with-help-dir=DIR path to help docs
--with-omf-dir=DIR path to OMF files
--with-help-formats=FORMATS
-@@ -1862,6 +1819,8 @@
+@@ -1862,6 +1823,8 @@
--with-group=<username> specify gdm's user name
--with-pam-prefix=<prefix>
specify where pam files go
@@ -12583,7 +12606,7 @@
--with-dbus-sys=<dir> where D-BUS system.d directory is
--with-dbus-services=<dir>
where D-BUS services directory is
-@@ -1890,14 +1849,12 @@
+@@ -1890,14 +1853,12 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -12599,7 +12622,18 @@
PKG_CONFIG path to pkg-config utility
GTHREAD_CFLAGS
C compiler flags for GTHREAD, overriding pkg-config
-@@ -2011,124 +1968,656 @@
+@@ -1925,6 +1886,10 @@
+ C compiler flags for DEVKIT_POWER, overriding pkg-config
+ DEVKIT_POWER_LIBS
+ linker flags for DEVKIT_POWER, overriding pkg-config
++ GDMSETUP_CFLAGS
++ C compiler flags for GDMSETUP, overriding pkg-config
++ GDMSETUP_LIBS
++ linker flags for GDMSETUP, overriding pkg-config
+ SIMPLE_GREETER_CFLAGS
+ C compiler flags for SIMPLE_GREETER, overriding pkg-config
+ SIMPLE_GREETER_LIBS
+@@ -2011,124 +1976,656 @@
if $ac_init_version; then
cat <<\_ACEOF
gdm configure 2.30.0
@@ -13350,7 +13384,7 @@
# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
-@@ -2148,13 +2637,13 @@
+@@ -2148,13 +2645,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13366,7 +13400,7 @@
esac ;;
esac
done
-@@ -2226,39 +2715,41 @@
+@@ -2226,39 +2723,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -13413,7 +13447,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2276,8 +2767,8 @@
+@@ -2276,8 +2775,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -13424,7 +13458,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2285,10 +2776,10 @@
+@@ -2285,10 +2784,10 @@
done
if test -r "$cache_file"; then
@@ -13439,7 +13473,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2296,7 +2787,7 @@
+@@ -2296,7 +2795,7 @@
esac
fi
else
@@ -13448,7 +13482,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2311,11 +2802,11 @@
+@@ -2311,11 +2810,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -13462,7 +13496,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2325,17 +2816,17 @@
+@@ -2325,17 +2824,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
@@ -13484,7 +13518,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2347,77 +2838,46 @@
+@@ -2347,77 +2846,46 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -13588,7 +13622,7 @@
# These three variables are undocumented and unsupported,
# and are intended to be withdrawn in a future Autoconf release.
-@@ -2442,10 +2902,10 @@
+@@ -2442,10 +2910,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.
@@ -13601,7 +13635,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2453,11 +2913,11 @@
+@@ -2453,11 +2921,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13617,7 +13651,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2494,7 +2954,7 @@
+@@ -2494,7 +2962,7 @@
;;
esac
@@ -13626,7 +13660,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2510,7 +2970,7 @@
+@@ -2510,7 +2978,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -13635,7 +13669,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2521,21 +2981,34 @@
+@@ -2521,21 +2989,34 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -13673,7 +13707,7 @@
fi
rm -f conftest.file
if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2545,11 +3018,8 @@
+@@ -2545,11 +3026,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".
@@ -13687,7 +13721,7 @@
fi
test "$2" = conftest.file
-@@ -2558,13 +3028,10 @@
+@@ -2558,13 +3036,10 @@
# Ok.
:
else
@@ -13704,7 +13738,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2579,20 +3046,136 @@
+@@ -2579,20 +3054,136 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -13845,7 +13879,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2600,7 +3183,7 @@
+@@ -2600,7 +3191,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13854,7 +13888,7 @@
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 #(
-@@ -2612,11 +3195,12 @@
+@@ -2612,11 +3203,12 @@
esac
done
done
@@ -13868,7 +13902,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2624,11 +3208,10 @@
+@@ -2624,11 +3216,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -13881,7 +13915,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2641,9 +3224,9 @@
+@@ -2641,9 +3232,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
@@ -13893,7 +13927,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2654,24 +3237,24 @@
+@@ -2654,24 +3245,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13923,7 +13957,7 @@
$as_echo "no" >&6; }
fi
-@@ -2679,11 +3262,11 @@
+@@ -2679,11 +3270,11 @@
test -n "$AWK" && break
done
@@ -13937,7 +13971,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2701,11 +3284,11 @@
+@@ -2701,11 +3292,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -13951,7 +13985,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2725,9 +3308,7 @@
+@@ -2725,9 +3316,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -13962,7 +13996,7 @@
fi
fi
-@@ -2771,108 +3352,6 @@
+@@ -2771,108 +3360,6 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -14071,7 +14105,7 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
-@@ -2885,17 +3364,29 @@
+@@ -2885,17 +3372,29 @@
@@ -14104,7 +14138,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2918,44 +3409,44 @@
+@@ -2918,44 +3417,44 @@
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@@ -14168,7 +14202,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2980,9 +3471,9 @@
+@@ -2980,9 +3479,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
@@ -14180,7 +14214,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2993,24 +3484,24 @@
+@@ -2993,24 +3492,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14210,7 +14244,7 @@
$as_echo "no" >&6; }
fi
-@@ -3020,9 +3511,9 @@
+@@ -3020,9 +3519,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
@@ -14222,7 +14256,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3033,24 +3524,24 @@
+@@ -3033,24 +3532,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14252,7 +14286,7 @@
$as_echo "no" >&6; }
fi
-@@ -3059,7 +3550,7 @@
+@@ -3059,7 +3558,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14261,7 +14295,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3073,9 +3564,9 @@
+@@ -3073,9 +3572,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
@@ -14273,7 +14307,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3086,24 +3577,24 @@
+@@ -3086,24 +3585,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14303,7 +14337,7 @@
$as_echo "no" >&6; }
fi
-@@ -3113,9 +3604,9 @@
+@@ -3113,9 +3612,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
@@ -14315,7 +14349,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3127,18 +3618,18 @@
+@@ -3127,18 +3626,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14337,7 +14371,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3157,10 +3648,10 @@
+@@ -3157,10 +3656,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -14350,7 +14384,7 @@
$as_echo "no" >&6; }
fi
-@@ -3172,9 +3663,9 @@
+@@ -3172,9 +3671,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
@@ -14362,7 +14396,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3185,24 +3676,24 @@
+@@ -3185,24 +3684,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14392,7 +14426,7 @@
$as_echo "no" >&6; }
fi
-@@ -3216,9 +3707,9 @@
+@@ -3216,9 +3715,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
@@ -14404,7 +14438,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3229,24 +3720,24 @@
+@@ -3229,24 +3728,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14434,7 +14468,7 @@
$as_echo "no" >&6; }
fi
-@@ -3259,7 +3750,7 @@
+@@ -3259,7 +3758,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14443,7 +14477,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3270,57 +3761,37 @@
+@@ -3270,57 +3769,37 @@
fi
@@ -14521,7 +14555,7 @@
/* end confdefs.h. */
int
-@@ -3336,8 +3807,8 @@
+@@ -3336,8 +3815,8 @@
# 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.
@@ -14532,7 +14566,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3353,17 +3824,17 @@
+@@ -3353,17 +3832,17 @@
done
rm -f $ac_rmfiles
@@ -14555,7 +14589,7 @@
# 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,
-@@ -3380,7 +3851,7 @@
+@@ -3380,7 +3859,7 @@
# certainly right.
break;;
*.* )
@@ -14564,7 +14598,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3399,84 +3870,42 @@
+@@ -3399,84 +3878,42 @@
else
ac_file=''
fi
@@ -14670,7 +14704,7 @@
# 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
-@@ -3491,32 +3920,83 @@
+@@ -3491,32 +3928,83 @@
esac
done
else
@@ -14770,7 +14804,7 @@
/* end confdefs.h. */
int
-@@ -3528,17 +4008,17 @@
+@@ -3528,17 +4016,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -14793,7 +14827,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3551,31 +4031,23 @@
+@@ -3551,31 +4039,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14832,7 +14866,7 @@
/* end confdefs.h. */
int
-@@ -3589,37 +4061,16 @@
+@@ -3589,37 +4069,16 @@
return 0;
}
_ACEOF
@@ -14873,7 +14907,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3628,20 +4079,16 @@
+@@ -3628,20 +4087,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -14897,7 +14931,7 @@
/* end confdefs.h. */
int
-@@ -3652,35 +4099,11 @@
+@@ -3652,35 +4107,11 @@
return 0;
}
_ACEOF
@@ -14936,7 +14970,7 @@
/* end confdefs.h. */
int
-@@ -3691,36 +4114,12 @@
+@@ -3691,36 +4122,12 @@
return 0;
}
_ACEOF
@@ -14977,7 +15011,7 @@
/* end confdefs.h. */
int
-@@ -3731,42 +4130,17 @@
+@@ -3731,42 +4138,17 @@
return 0;
}
_ACEOF
@@ -15022,7 +15056,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3783,18 +4157,14 @@
+@@ -3783,18 +4165,14 @@
CFLAGS=
fi
fi
@@ -15044,7 +15078,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3851,32 +4221,9 @@
+@@ -3851,32 +4229,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -15078,7 +15112,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3887,17 +4234,19 @@
+@@ -3887,17 +4242,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -15101,7 +15135,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3907,9 +4256,9 @@
+@@ -3907,9 +4264,9 @@
depcc="$CC" am_compiler_list=
@@ -15113,7 +15147,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3935,6 +4284,11 @@
+@@ -3935,6 +4292,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -15125,7 +15159,7 @@
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
-@@ -3952,7 +4306,17 @@
+@@ -3952,7 +4314,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -15143,7 +15177,7 @@
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
-@@ -3962,19 +4326,23 @@
+@@ -3962,19 +4334,23 @@
break
fi
;;
@@ -15173,7 +15207,7 @@
${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
-@@ -3998,7 +4366,7 @@
+@@ -3998,7 +4374,7 @@
fi
fi
@@ -15182,7 +15216,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4019,14 +4387,14 @@
+@@ -4019,14 +4395,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
@@ -15199,7 +15233,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4041,11 +4409,7 @@
+@@ -4041,11 +4417,7 @@
# <limits.h> 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.
@@ -15212,7 +15246,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4054,78 +4418,34 @@
+@@ -4054,78 +4426,34 @@
#endif
Syntax error
_ACEOF
@@ -15296,7 +15330,7 @@
break
fi
-@@ -4137,7 +4457,7 @@
+@@ -4137,7 +4465,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -15305,7 +15339,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4148,11 +4468,7 @@
+@@ -4148,11 +4476,7 @@
# <limits.h> 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.
@@ -15318,7 +15352,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4161,87 +4477,40 @@
+@@ -4161,87 +4485,40 @@
#endif
Syntax error
_ACEOF
@@ -15415,7 +15449,7 @@
fi
ac_ext=c
-@@ -4251,9 +4520,9 @@
+@@ -4251,9 +4528,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -15427,7 +15461,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4264,7 +4533,7 @@
+@@ -4264,7 +4541,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15436,7 +15470,7 @@
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
-@@ -4284,7 +4553,7 @@
+@@ -4284,7 +4561,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
@@ -15445,7 +15479,7 @@
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"
-@@ -4299,26 +4568,24 @@
+@@ -4299,26 +4576,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -15477,7 +15511,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4332,7 +4599,7 @@
+@@ -4332,7 +4607,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15486,7 +15520,7 @@
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
-@@ -4352,7 +4619,7 @@
+@@ -4352,7 +4627,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
@@ -15495,7 +15529,7 @@
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"
-@@ -4367,12 +4634,10 @@
+@@ -4367,12 +4642,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -15510,7 +15544,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4380,21 +4645,17 @@
+@@ -4380,21 +4653,17 @@
fi
fi
@@ -15536,7 +15570,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4409,48 +4670,23 @@
+@@ -4409,48 +4678,23 @@
return 0;
}
_ACEOF
@@ -15590,7 +15624,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4460,18 +4696,14 @@
+@@ -4460,18 +4704,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -15612,7 +15646,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4481,14 +4713,10 @@
+@@ -4481,14 +4721,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -15629,7 +15663,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4515,118 +4743,34 @@
+@@ -4515,118 +4751,34 @@
return 0;
}
_ACEOF
@@ -15761,7 +15795,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4637,139 +4781,8 @@
+@@ -4637,139 +4789,8 @@
@@ -15903,7 +15937,7 @@
MINIX=yes
else
MINIX=
-@@ -4778,34 +4791,23 @@
+@@ -4778,34 +4799,23 @@
if test "$MINIX" = yes; then
@@ -15944,7 +15978,7 @@
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -4818,69 +4820,35 @@
+@@ -4818,69 +4828,35 @@
return 0;
}
_ACEOF
@@ -16026,7 +16060,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4895,48 +4863,23 @@
+@@ -4895,48 +4871,23 @@
return 0;
}
_ACEOF
@@ -16080,7 +16114,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4946,18 +4889,14 @@
+@@ -4946,18 +4897,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -16102,7 +16136,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4967,14 +4906,10 @@
+@@ -4967,14 +4914,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -16119,7 +16153,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5001,51 +4936,22 @@
+@@ -5001,51 +4944,22 @@
return 0;
}
_ACEOF
@@ -16178,7 +16212,7 @@
fi
-@@ -5063,9 +4969,9 @@
+@@ -5063,9 +4977,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
@@ -16190,7 +16224,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -5076,24 +4982,24 @@
+@@ -5076,24 +4990,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16220,7 +16254,7 @@
$as_echo "no" >&6; }
fi
-@@ -5107,9 +5013,9 @@
+@@ -5107,9 +5021,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
@@ -16232,7 +16266,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -5120,24 +5026,24 @@
+@@ -5120,24 +5034,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16262,7 +16296,7 @@
$as_echo "no" >&6; }
fi
-@@ -5150,7 +5056,7 @@
+@@ -5150,7 +5064,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16271,7 +16305,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5161,53 +5067,36 @@
+@@ -5161,53 +5075,36 @@
fi
fi
# Provide some information about the compiler.
@@ -16344,7 +16378,7 @@
/* end confdefs.h. */
int
-@@ -5221,37 +5110,16 @@
+@@ -5221,37 +5118,16 @@
return 0;
}
_ACEOF
@@ -16385,7 +16419,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -5260,20 +5128,16 @@
+@@ -5260,20 +5136,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -16409,7 +16443,7 @@
/* end confdefs.h. */
int
-@@ -5284,35 +5148,11 @@
+@@ -5284,35 +5156,11 @@
return 0;
}
_ACEOF
@@ -16448,7 +16482,7 @@
/* end confdefs.h. */
int
-@@ -5323,36 +5163,12 @@
+@@ -5323,36 +5171,12 @@
return 0;
}
_ACEOF
@@ -16489,7 +16523,7 @@
/* end confdefs.h. */
int
-@@ -5363,42 +5179,17 @@
+@@ -5363,42 +5187,17 @@
return 0;
}
_ACEOF
@@ -16534,7 +16568,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -5423,9 +5214,9 @@
+@@ -5423,9 +5222,9 @@
depcc="$CXX" am_compiler_list=
@@ -16546,7 +16580,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5451,6 +5242,11 @@
+@@ -5451,6 +5250,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -16558,7 +16592,7 @@
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
-@@ -5468,7 +5264,17 @@
+@@ -5468,7 +5272,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -16576,7 +16610,7 @@
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
-@@ -5478,19 +5284,23 @@
+@@ -5478,19 +5292,23 @@
break
fi
;;
@@ -16606,7 +16640,7 @@
${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
-@@ -5514,7 +5324,7 @@
+@@ -5514,7 +5332,7 @@
fi
fi
@@ -16615,7 +16649,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -5530,22 +5340,18 @@
+@@ -5530,22 +5348,18 @@
if test "x$CC" != xcc; then
@@ -16642,7 +16676,7 @@
/* end confdefs.h. */
int
-@@ -5561,63 +5367,63 @@
+@@ -5561,63 +5375,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.*
@@ -16731,7 +16765,7 @@
then
# cc works too.
:
-@@ -5634,23 +5440,22 @@
+@@ -5634,23 +5448,22 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -16761,7 +16795,7 @@
# 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.
-@@ -5660,109 +5465,54 @@
+@@ -5660,109 +5473,54 @@
fi
@@ -16897,7 +16931,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5778,28 +5528,24 @@
+@@ -5778,28 +5536,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -16931,7 +16965,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5815,66 +5561,177 @@
+@@ -5815,66 +5569,177 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -17150,7 +17184,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -5883,7 +5740,7 @@
+@@ -5883,7 +5748,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -17159,7 +17193,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -5897,9 +5754,9 @@
+@@ -5897,9 +5762,9 @@
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
@@ -17172,7 +17206,7 @@
done
test -z "$LD" && LD="$ac_prog"
;;
-@@ -5913,13 +5770,13 @@
+@@ -5913,13 +5778,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17189,7 +17223,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -5950,18 +5807,16 @@
+@@ -5950,18 +5815,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17213,7 +17247,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5974,39 +5829,21 @@
+@@ -5974,39 +5837,21 @@
;;
esac
fi
@@ -17263,7 +17297,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6050,1217 +5887,1069 @@
+@@ -6050,1217 +5895,1069 @@
done
IFS="$lt_save_ifs"
done
@@ -17505,13 +17539,13 @@
+else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
-+ (eval echo "\"\$as_me:6018: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6026: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
-+ (eval echo "\"\$as_me:6021: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6029: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
-+ (eval echo "\"\$as_me:6024: output\"" >&5)
++ (eval echo "\"\$as_me:6032: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
@@ -19349,7 +19383,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7273,33 +6962,18 @@
+@@ -7273,33 +6970,18 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -19385,7 +19419,7 @@
;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
-@@ -7324,57 +6998,85 @@
+@@ -7324,57 +7006,85 @@
;;
esac
@@ -19489,7 +19523,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7383,53 +7085,55 @@
+@@ -7383,53 +7093,55 @@
fi
# Make sure that we snagged all the symbols we need.
@@ -19568,7 +19602,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7447,7 +7151,7 @@
+@@ -7447,7 +7159,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -19577,7 +19611,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -7463,6041 +7167,3696 @@
+@@ -7463,6041 +7175,3696 @@
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
@@ -19668,7 +19702,7 @@
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 7229 "configure"' > conftest.$ac_ext
++ echo '#line 7237 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
@@ -23934,11 +23968,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:9018: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9026: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:9022: \$? = $ac_status" >&5
++ echo "$as_me:9030: \$? = $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.
@@ -24720,11 +24754,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:9357: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9365: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:9361: \$? = $ac_status" >&5
++ echo "$as_me:9369: \$? = $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.
@@ -25046,11 +25080,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:9462: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9470: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:9466: \$? = $ac_status" >&5
++ echo "$as_me:9474: \$? = $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
@@ -25142,11 +25176,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:9517: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9525: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:9521: \$? = $ac_status" >&5
++ echo "$as_me:9529: \$? = $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
@@ -28564,7 +28598,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -13511,20 +10870,6 @@
+@@ -13511,20 +10878,6 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -28585,7 +28619,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13542,7 +10887,7 @@
+@@ -13542,7 +10895,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -28594,7 +28628,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13561,7 +10906,7 @@
+@@ -13561,7 +10914,7 @@
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
@@ -28603,7 +28637,7 @@
:
else
can_build_shared=no
-@@ -13587,9 +10932,18 @@
+@@ -13587,9 +10940,18 @@
;;
amigaos*)
@@ -28625,7 +28659,7 @@
;;
beos*)
-@@ -13612,25 +10966,28 @@
+@@ -13612,25 +10974,28 @@
# libtool to hard-code these into programs
;;
@@ -28659,7 +28693,7 @@
shlibpath_overrides_runpath=yes
case $host_os in
-@@ -13639,20 +10996,20 @@
+@@ -13639,20 +11004,20 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -28685,7 +28719,7 @@
fi
;;
pw32*)
-@@ -13676,17 +11033,13 @@
+@@ -13676,17 +11041,13 @@
version_type=darwin
need_lib_prefix=no
need_version=no
@@ -28706,7 +28740,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13703,18 +11056,6 @@
+@@ -13703,18 +11064,6 @@
dynamic_linker=no
;;
@@ -28725,7 +28759,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13752,7 +11093,7 @@
+@@ -13752,7 +11101,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -28734,7 +28768,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13791,18 +11132,18 @@
+@@ -13791,18 +11140,18 @@
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -28765,7 +28799,7 @@
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
-@@ -13815,7 +11156,7 @@
+@@ -13815,7 +11164,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -28774,7 +28808,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13870,7 +11211,7 @@
+@@ -13870,7 +11219,7 @@
;;
# This must be Linux ELF.
@@ -28783,7 +28817,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13879,6 +11220,32 @@
+@@ -13879,6 +11228,32 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -28816,7 +28850,7 @@
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
-@@ -13886,7 +11253,7 @@
+@@ -13886,7 +11261,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -28825,7 +28859,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13899,7 +11266,7 @@
+@@ -13899,7 +11274,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -28834,7 +28868,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13908,14 +11275,14 @@
+@@ -13908,14 +11283,14 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -28851,7 +28885,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -13936,14 +11303,16 @@
+@@ -13936,14 +11311,16 @@
shlibpath_overrides_runpath=yes
;;
@@ -28871,7 +28905,7 @@
;;
openbsd*)
-@@ -13952,13 +11321,13 @@
+@@ -13952,13 +11329,13 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -28888,7 +28922,7 @@
case $host_os in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
-@@ -13992,6 +11361,10 @@
+@@ -13992,6 +11369,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -28899,7 +28933,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14026,7 +11399,6 @@
+@@ -14026,7 +11407,6 @@
sni)
shlibpath_overrides_runpath=no
need_lib_prefix=no
@@ -28907,7 +28941,7 @@
runpath_var=LD_RUN_PATH
;;
siemens)
-@@ -14057,13 +11429,12 @@
+@@ -14057,13 +11437,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -28922,7 +28956,7 @@
case $host_os in
sco3.2v5*)
sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-@@ -14073,6 +11444,17 @@
+@@ -14073,6 +11452,17 @@
sys_lib_dlsearch_path_spec='/usr/lib'
;;
@@ -28940,7 +28974,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14084,7 +11466,7 @@
+@@ -14084,7 +11474,7 @@
dynamic_linker=no
;;
esac
@@ -28949,7 +28983,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -14093,8927 +11475,3225 @@
+@@ -14093,11370 +11483,4645 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -29856,7 +29890,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
-+#line 11901 "configure"
++#line 11909 "configure"
+#include "confdefs.h"
- amigaos*)
@@ -30002,7 +30036,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
-+#line 11997 "configure"
++#line 12005 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -34555,18 +34589,24 @@
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-- -e 's:$: $lt_compiler_flag:'`
++ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17607: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
-- ac_status=$?
++ (eval echo "\"\$as_me:13961: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:17611: \$? = $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
++ cat conftest.err >&5
++ echo "$as_me:13965: \$? = $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
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
@@ -38257,15 +38297,33 @@
-
-HELP_DIR="$with_help_dir"
-
--
--
++ # So say no if there are warnings other than the usual output.
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++ lt_cv_prog_compiler_pic_works_CXX=yes
++ fi
++ fi
++ $RM conftest*
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
-# Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then
- withval=$with_omf_dir;
--else
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
++ case $lt_prog_compiler_pic_CXX in
++ "" | " "*) ;;
++ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++ esac
+ else
- with_omf_dir='${datadir}/omf'
--fi
--
++ lt_prog_compiler_pic_CXX=
++ lt_prog_compiler_can_build_shared_CXX=no
+ fi
+
-OMF_DIR="$with_omf_dir"
-
-
@@ -38275,26 +38333,57 @@
- withval=$with_help_formats;
-else
- with_help_formats=''
--fi
--
+ fi
+
-DOC_USER_FORMATS="$with_help_formats"
--
--
+
+
-# Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then
- enableval=$enable_scrollkeeper;
--else
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++{ $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_CXX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- enable_scrollkeeper=yes
-fi
--
++ lt_cv_prog_compiler_static_works_CXX=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_cv_prog_compiler_static_works_CXX=yes
++ fi
++ else
++ lt_cv_prog_compiler_static_works_CXX=yes
++ fi
++ fi
++ $RM -r conftest*
++ LDFLAGS="$save_LDFLAGS"
+
- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
- ENABLE_SK_TRUE=
- ENABLE_SK_FALSE='#'
-else
- ENABLE_SK_TRUE='#'
- ENABLE_SK_FALSE=
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
-
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-
@@ -38302,14 +38391,17 @@
- if test "$gdu_cv_have_gdu" = "yes"; then
- HAVE_GNOME_DOC_UTILS_TRUE=
- HAVE_GNOME_DOC_UTILS_FALSE='#'
--else
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
++ :
+ else
- HAVE_GNOME_DOC_UTILS_TRUE='#'
- HAVE_GNOME_DOC_UTILS_FALSE=
--fi
--
--
--
--
++ lt_prog_compiler_static_CXX=
+ fi
+
+
+
+
-GETTEXT_PACKAGE=gdm
-
-
@@ -38327,7 +38419,10 @@
- { $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
++ { $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_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -38365,7 +38460,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -38375,7 +38470,13 @@
-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; }
--
++ lt_cv_prog_compiler_c_o_CXX=no
++ $RM -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -38408,14 +38509,49 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ lt_compile=`echo "$ac_compile" | $SED \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++ (eval echo "\"\$as_me:14060: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
++ echo "$as_me:14064: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ lt_cv_prog_compiler_c_o_CXX=yes
++ fi
++ fi
++ chmod u+w . 2>&5
++ $RM conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++ $RM out/* && rmdir out
++ cd ..
++ $RM -r conftest
++ $RM conftest*
+
- ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
-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: )
@@ -38449,15 +38585,25 @@
-{ $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
++
++ { $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_CXX+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; }
--
++ lt_cv_prog_compiler_c_o_CXX=no
++ $RM -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -38465,11 +38611,46 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
--fi
--
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ lt_compile=`echo "$ac_compile" | $SED \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++ (eval echo "\"\$as_me:14112: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
++ echo "$as_me:14116: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ lt_cv_prog_compiler_c_o_CXX=yes
++ fi
++ fi
++ chmod u+w . 2>&5
++ $RM conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++ $RM out/* && rmdir out
++ cd ..
++ $RM -r conftest
++ $RM conftest*
+
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
-done
--
+
- if test $ac_cv_header_locale_h = yes; then
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-$as_echo_n "checking for LC_MESSAGES... " >&6; }
@@ -38516,33 +38697,85 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- 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
--fi
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++ # do not overwrite the value of need_locks provided by the user
++ { $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*
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ touch conftest.a
++ ln conftest.a conftest.b 2>&5 || hard_links=no
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ { $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:${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
++else
++ need_locks=no
+ fi
-{ $as_echo "$as_me:$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
--
-- fi
+
++
++ { $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; }
++
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ case $host_os in
++ aix[4-9]*)
++ # If we're using GNU nm, then we don't want the "-C" option.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ else
++ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
- fi
- USE_NLS=yes
--
--
++ ;;
++ pw32*)
++ export_symbols_cmds_CXX="$ltdll_cmds"
++ ;;
++ cygwin* | mingw* | cegcc*)
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
++ *)
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
++ esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
++$as_echo "$ld_shlibs_CXX" >&6; }
++test "$ld_shlibs_CXX" = no && can_build_shared=no
+
- gt_cv_have_gettext=no
--
++with_gnu_ld_CXX=$with_gnu_ld
+
- CATOBJEXT=NONE
- 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; }
@@ -38586,14 +38819,14 @@
-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; }
@@ -38626,14 +38859,34 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
-fi
--
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++ # Assume -lc should be added
++ archive_cmds_need_lc_CXX=yes
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
++ case $archive_cmds_CXX in
++ *'~'*)
++ # FIXME: we may have to deal with multi-command sequences.
++ ;;
++ '$CC '*)
++ # Test whether the compiler implicitly links with -lc since on some
++ # systems, -lgcc has to come before -lc. If gcc already passes -lc
++ # to ld, don't add -lc before -lgcc.
++ { $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
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -38663,7 +38916,46 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
--esac
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ $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
++ deplibs=
++ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++ allow_undefined_flag_CXX=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ then
++ archive_cmds_need_lc_CXX=no
++ else
++ archive_cmds_need_lc_CXX=yes
++ fi
++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
++$as_echo "$archive_cmds_need_lc_CXX" >&6; }
++ ;;
++ esac
++ fi
++ ;;
+ 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
@@ -38673,12 +38965,12 @@
-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
- gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
--
+
- #
- # First check in libc
- #
@@ -38693,9 +38985,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#include <libintl.h>
--
+
-int
-main ()
-{
@@ -38729,18 +39021,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- 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
--
+
-fi
-{ $as_echo "$as_me:$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_n "checking for dgettext in libc... " >&6; }
@@ -38753,9 +39045,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#include <libintl.h>
--
+
-int
-main ()
-{
@@ -38789,21 +39081,21 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- 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
--
+
-fi
-{ $as_echo "$as_me:$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`
@@ -38821,20 +39113,20 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#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. */
@@ -38848,7 +39140,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
+
-int
-main ()
-{
@@ -38882,10 +39174,10 @@
-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
@@ -38900,19 +39192,19 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
+
-fi
-done
--
+
- 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
--
+
- { $as_echo "$as_me:$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
@@ -38926,7 +39218,7 @@
-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. */
@@ -38967,10 +39259,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- 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
@@ -38992,7 +39284,7 @@
-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. */
@@ -39033,31 +39325,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:13953: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:13957: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_cv_prog_compiler_pic_works_CXX=yes
-+ fi
-+ fi
-+ $RM conftest*
- ac_cv_lib_intl_ngettext=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39071,12 +39341,7 @@
-$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
- $as_echo_n "(cached) " >&6
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-+ case $lt_prog_compiler_pic_CXX in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-+ esac
- else
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39085,9 +39350,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ lt_prog_compiler_pic_CXX=
-+ lt_prog_compiler_can_build_shared_CXX=no
-+fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39126,47 +39388,12 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_intl_dgettext=yes
-+fi
-+
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+{ $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_CXX+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ lt_cv_prog_compiler_static_works_CXX=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_cv_prog_compiler_static_works_CXX=yes
-+ fi
-+ else
-+ lt_cv_prog_compiler_static_works_CXX=yes
-+ fi
-+ fi
-+ $RM -r conftest*
-+ LDFLAGS="$save_LDFLAGS"
- ac_cv_lib_intl_dgettext=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39177,11 +39404,7 @@
-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
- gt_cv_func_dgettext_libintl=yes
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static_CXX=
- fi
+-fi
-fi
@@ -39196,11 +39419,8 @@
- { $as_echo "$as_me:$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
-+ { $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_CXX+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39209,12 +39429,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $RM -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39256,44 +39470,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:14052: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:14056: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ lt_cv_prog_compiler_c_o_CXX=yes
-+ fi
-+ fi
-+ chmod u+w . 2>&5
-+ $RM conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+ $RM out/* && rmdir out
-+ cd ..
-+ $RM -r conftest
-+ $RM conftest*
- ac_cv_lib_intl_ngettext=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39306,13 +39485,8 @@
- { $as_echo "$as_me:$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
-+
-+
-+ { $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_CXX+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39321,12 +39495,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $RM -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39368,45 +39536,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:14104: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:14108: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ lt_cv_prog_compiler_c_o_CXX=yes
-+ fi
-+ fi
-+ chmod u+w . 2>&5
-+ $RM conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+ $RM out/* && rmdir out
-+ cd ..
-+ $RM -r conftest
-+ $RM conftest*
- ac_cv_lib_intl_dcgettext=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39422,29 +39554,9 @@
- :
-fi
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ { $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*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ { $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:${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
- else
+-else
- :
-+ need_locks=no
- fi
+-fi
- fi
@@ -39475,50 +39587,19 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+ { $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; }
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ case $host_os in
-+ aix[4-9]*)
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ ;;
-+ pw32*)
-+ export_symbols_cmds_CXX="$ltdll_cmds"
-+ ;;
-+ cygwin* | mingw* | cegcc*)
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs_CXX=no
-+ ;;
-+ *)
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
-#undef $ac_func
-+with_gnu_ld_CXX=$with_gnu_ld
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39590,13 +39671,6 @@
-done
- LIBS="$glib_save_LIBS"
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_CXX" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_CXX=yes
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -39606,76 +39680,8 @@
- gt_cv_func_dgettext_libintl=no
- fi
- fi
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_CXX in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ { $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\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ $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
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_CXX
-+ pic_flag=$lt_prog_compiler_pic_CXX
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+ allow_undefined_flag_CXX=
-+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ then
-+ archive_cmds_need_lc_CXX=no
-+ else
-+ archive_cmds_need_lc_CXX=yes
- fi
-+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
- fi
-+ $RM conftest*
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+- fi
+- fi
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -39702,7 +39708,38 @@
- case "$MSGFMT" in
- /*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-- ;;
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
++$as_echo_n "checking dynamic linker characteristics... " >&6; }
++
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++ shlibpath_var=LIBPATH
++
++ # AIX 3 has no versioning support, so we append a major version to the name.
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
@@ -39711,12 +39748,53 @@
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
-- fi
-- fi
++
++aix[4-9]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ hardcode_into_libs=yes
++ if test "$host_cpu" = ia64; then
++ # AIX 5 supports IA64
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ else
++ # With GCC up to 2.95.x, collect2 would create an import file
++ # for dependence libraries. The import file would start with
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
++ # development snapshots of GCC prior to 3.0.
++ case $host_os in
++ aix4 | aix4.[01] | aix4.[01].*)
++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++ echo ' yes '
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++ :
++ else
++ can_build_shared=no
+ fi
++ ;;
++ esac
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++ # soname into executable. Probably we can add versioning support to
++ # collect2, so additional links can be useful in future.
++ if test "$aix_use_runtimelinking" = yes; then
++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++ # instead of lib<name>.a to let people know that these are not
++ # typical AIX shared libraries.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
++ # We preserve .a as extension for shared libraries through AIX4.2
++ # and later when we are not doing run time linking.
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-- ;;
++ shlibpath_var=LIBPATH
++ fi
+ ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
@@ -39730,7 +39808,7 @@
- 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`
@@ -39748,7 +39826,7 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -39759,8 +39837,27 @@
-#else
-# include <assert.h>
-#endif
++amigaos*)
++ case $host_cpu in
++ powerpc)
++ # Since July 2007 AmigaOS4 officially supports .so libraries.
++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ ;;
++ m68k)
++ library_names_spec='$libname.ixlibrary $libname.a'
++ # Create ${libname}_ixlibrary.a entries in /sys/libs.
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ ;;
++ esac
++ ;;
-#undef $ac_func
++beos*)
++ library_names_spec='${libname}${shared_ext}'
++ dynamic_linker="$host_os ld.so"
++ shlibpath_var=LIBRARY_PATH
++ ;;
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39775,6 +39872,19 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++bsdi[45]*)
++ version_type=linux
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++ # the default ld.so.conf also contains /usr/contrib/lib and
++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++ # libtool to hard-code these into programs
++ ;;
-int
-main ()
@@ -39809,480 +39919,14 @@
-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
-
-- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
--$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-- cat >conftest.foo <<_ACEOF
-
--msgid ""
--msgstr ""
--"Content-Type: text/plain; charset=UTF-8\n"
--"Project-Id-Version: test 1.0\n"
--"PO-Revision-Date: 2007-02-15 12:01+0100\n"
--"Last-Translator: test <foo at bar.xx>\n"
--"Language-Team: C <LL at li.org>\n"
--"MIME-Version: 1.0\n"
--"Content-Transfer-Encoding: 8bit\n"
-
--_ACEOF
--if { ($as_echo "$as_me:$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 "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--echo "$as_me: failed input was:" >&5
--sed 's/^/| /' conftest.foo >&5
--fi
-
-- # Extract the first word of "gmsgfmt", so it can be a program name with args.
--set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GMSGFMT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-- ;;
--esac
--fi
--GMSGFMT=$ac_cv_path_GMSGFMT
--if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--$as_echo "$GMSGFMT" >&6; }
--else
-- { $as_echo "$as_me:$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_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case "$XGETTEXT" in
-- /*)
-- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-- ;;
--esac
--fi
--XGETTEXT="$ac_cv_path_XGETTEXT"
--if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$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 <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
-- CATOBJEXT=.gmo
-- DATADIRNAME=share
--else
-- CATOBJEXT=.mo
-- DATADIRNAME=lib
--fi
-
-- ;;
-- *)
-- CATOBJEXT=.mo
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- LIBS="$glib_save_LIBS"
-- INSTOBJEXT=.mo
-- else
-- gt_cv_have_gettext=no
-- fi
-- fi
-
--fi
-
-
-
-- if test "$gt_cv_have_gettext" = "yes" ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_NLS 1
--_ACEOF
-
-- fi
-
-- if test "$XGETTEXT" != ":"; then
-- 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 "found xgettext program is not GNU xgettext; ignore it" >&6; }
-- XGETTEXT=":"
-- fi
-- fi
-
-- # We need to process the po/ directory.
-- POSUB=po
-
-- ac_config_commands="$ac_config_commands default-1"
-
-
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
-
-
-
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-
-+aix[4-9]*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-
-+amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # Since July 2007 AmigaOS4 officially supports .so libraries.
-+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ ;;
-+ m68k)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+ esac
-+ ;;
-
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-
-- if test "$gt_cv_have_gettext" = "yes"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- { $as_echo "$as_me:$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
-- 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
-- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
--$as_echo "$LINGUAS" >&6; }
-- fi
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-- fi
+- eval "$as_ac_var=no"
+-fi
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
@@ -40301,13 +39945,20 @@
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- 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
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -40337,6 +39988,8 @@
+ esac
+ ;;
+-fi
+-done
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
@@ -40346,19 +39999,10 @@
+ shlibpath_var=PATH
+ ;;
-- 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
+- MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
+- cat >conftest.foo <<_ACEOF
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
@@ -40370,9 +40014,31 @@
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-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 <foo at bar.xx>\n"
+-"Language-Team: C <LL at li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+-_ACEOF
+-if { ($as_echo "$as_me:$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 "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-echo "$as_me: failed input was:" >&5
+-sed 's/^/| /' conftest.foo >&5
+-fi
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
@@ -40382,22 +40048,31 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
--DBUS_GLIB_REQUIRED_VERSION=0.74
--GLIB_REQUIRED_VERSION=2.22.0
--GTK_REQUIRED_VERSION=2.12.0
--PANGO_REQUIRED_VERSION=1.3.0
--SCROLLKEEPER_REQUIRED_VERSION=0.1.4
--GCONF_REQUIRED_VERSION=2.6.1
--GNOME_PANEL_REQUIRED_VERSION=2.0.0
--LIBXKLAVIER_REQUIRED_VERSION=4.0
--LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
--#FONTCONFIG_REQUIRED_VERSION=2.6.0
--FONTCONFIG_REQUIRED_VERSION=2.5.0
--DEVKIT_POWER_REQUIRED_VERSION=008
+- # 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_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $GMSGFMT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+freebsd1*)
+ dynamic_linker=no
-+ ;;
-
+ ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -40408,7 +40083,10 @@
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
-+ fi
+ fi
+-done
+-done
+-IFS=$as_save_IFS
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
@@ -40442,6 +40120,7 @@
+ esac
+ ;;
+- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
@@ -40450,14 +40129,18 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
-+ ;;
-
-- # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
-- enableval=$enable_compile_warnings;
+ ;;
+-esac
+-fi
+-GMSGFMT=$ac_cv_path_GMSGFMT
+-if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-$as_echo "$GMSGFMT" >&6; }
-else
-- enable_compile_warnings="yes"
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-fi
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
@@ -40504,6 +40187,16 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+- # 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_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case "$XGETTEXT" in
+- /*)
+- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
@@ -40514,12 +40207,8 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
-+ ;;
-
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
+ ;;
++
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
@@ -40538,7 +40227,19 @@
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
-+ *)
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
@@ -40556,13 +40257,549 @@
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
-
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
++
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+-esac
+-fi
+-XGETTEXT="$ac_cv_path_XGETTEXT"
+-if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$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
++# This must be Linux ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # Some binutils ld are patched to set DT_RUNPATH
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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 <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+- CATOBJEXT=.gmo
+- DATADIRNAME=share
+-else
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
+-fi
+-
+- ;;
+- *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
+- ;;
+- esac
++if ac_fn_cxx_try_link "$LINENO"; then :
++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
++ shlibpath_overrides_runpath=yes
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$glib_save_LIBS"
+- INSTOBJEXT=.mo
+- else
+- gt_cv_have_gettext=no
+- fi
+- fi
+-
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
+- if test "$gt_cv_have_gettext" = "yes" ; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
+-
+- fi
+-
+- if test "$XGETTEXT" != ":"; then
+- 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 "found xgettext program is not GNU xgettext; ignore it" >&6; }
+- XGETTEXT=":"
+- fi
+- fi
+-
+- # We need to process the po/ directory.
+- POSUB=po
+-
+- ac_config_commands="$ac_config_commands default-1"
+-
+-
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++ # We used to test for /lib/ld.so.1 and disable shared libraries on
++ # powerpc, because MkLinux only supported shared libraries with the
++ # GNU dynamic linker. Since this was broken with cross compilers,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
+
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
+- if test "$gt_cv_have_gettext" = "yes"; then
+- if test "x$ALL_LINGUAS" = "x"; then
+- LINGUAS=
+- else
+- { $as_echo "$as_me:$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
+- 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
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+-$as_echo "$LINGUAS" >&6; }
+- fi
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
+- if test -n "$LINGUAS"; then
+- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+- fi
+- fi
++*nto* | *qnx*)
++ version_type=qnx
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='ldqnx.so'
++ ;;
+
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
++ ;;
+
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
+- 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
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
+
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
+-DBUS_GLIB_REQUIRED_VERSION=0.74
+-GLIB_REQUIRED_VERSION=2.22.0
+-GTK_REQUIRED_VERSION=2.12.0
+-PANGO_REQUIRED_VERSION=1.3.0
+-SCROLLKEEPER_REQUIRED_VERSION=0.1.4
+-GCONF_REQUIRED_VERSION=2.6.1
+-GNOME_PANEL_REQUIRED_VERSION=2.0.0
+-LIBXKLAVIER_REQUIRED_VERSION=4.0
+-LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+-#FONTCONFIG_REQUIRED_VERSION=2.6.0
+-FONTCONFIG_REQUIRED_VERSION=2.5.0
+-DEVKIT_POWER_REQUIRED_VERSION=008
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
++
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
+
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
+- # Check whether --enable-compile-warnings was given.
+-if test "${enable_compile_warnings+set}" = set; then
+- enableval=$enable_compile_warnings;
+-else
+- enable_compile_warnings="yes"
+-fi
++tpf*)
++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
++*)
++ dynamic_linker=no
++ ;;
++esac
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
++$as_echo "$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+
+- warning_flags=
+- realsave_CFLAGS="$CFLAGS"
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
- case "$enable_compile_warnings" in
- no)
@@ -40587,29 +40824,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # Some binutils ld are patched to set DT_RUNPATH
-+ save_LDFLAGS=$LDFLAGS
-+ save_libdir=$libdir
-+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -23024,2605 +14704,1416 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++fi
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++fi
+
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40632,17 +40862,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- has_option=no
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+ shlibpath_overrides_runpath=yes
- fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LDFLAGS=$save_LDFLAGS
-+ libdir=$save_libdir
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
@@ -40658,110 +40880,18 @@
- if test "$enable_compile_warnings" = "error" ; then
- warning_flags="$warning_flags -Werror"
- fi
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+*nto* | *qnx*)
-+ version_type=qnx
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='ldqnx.so'
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
- ;;
+- ;;
- *)
- { { $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; }; }
-+ *)
-+ shlibpath_overrides_runpath=yes
- ;;
+- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
- { $as_echo "$as_me:$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 "$warning_flags" >&6; }
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
- # Check whether --enable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
@@ -40769,54 +40899,7 @@
-else
- enable_iso_c=no
-fi
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
+
- { $as_echo "$as_me:$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; }
@@ -40835,89 +40918,15 @@
- fi
- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-$as_echo "$complCFLAGS" >&6; }
-+sysv4 | sysv4.3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
- WARN_CFLAGS="$warning_flags $complCFLAGS"
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-
-+tpf*)
-+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
+
+
+
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GTHREAD" >&5
-$as_echo_n "checking for GTHREAD... " >&6; }
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-if test -n "$GTHREAD_CFLAGS"; then
- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
@@ -40934,10 +40943,7 @@
-fi
- else
- pkg_failed=untried
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
+-fi
-if test -n "$GTHREAD_LIBS"; then
- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
- elif test -n "$PKG_CONFIG"; then
@@ -40950,15 +40956,10 @@
- pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- fi
+-fi
- else
- pkg_failed=untried
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- fi
+-fi
@@ -41093,87 +41094,15 @@
-if test $pkg_failed = yes; then
-
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gobject-2.0 >= $GLIB_REQUIRED_VERSION
-- gio-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-- else
-- COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gobject-2.0 >= $GLIB_REQUIRED_VERSION
-- gio-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$COMMON_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gobject-2.0 >= $GLIB_REQUIRED_VERSION
-- gio-2.0 >= $GLIB_REQUIRED_VERSION
--) were not met:
-
--$COMMON_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 COMMON_CFLAGS
--and COMMON_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 (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gobject-2.0 >= $GLIB_REQUIRED_VERSION
-- gio-2.0 >= $GLIB_REQUIRED_VERSION
--) were not met:
-
--$COMMON_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 COMMON_CFLAGS
--and COMMON_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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 COMMON_CFLAGS
--and COMMON_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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
--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 COMMON_CFLAGS
--and COMMON_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+
+ { $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_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+ test -n "$runpath_var_CXX" ||
+ test "X$hardcode_automatic_CXX" = "Xyes" ; then
-+
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct_CXX" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -41188,18 +41117,31 @@
+ hardcode_action_CXX=immediate
+ fi
else
-- COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS
-- COMMON_LIBS=$pkg_cv_COMMON_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
+- _pkg_short_errors_supported=no
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_CXX=unsupported
-+fi
+ fi
+- if test $_pkg_short_errors_supported = yes; then
+- COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gobject-2.0 >= $GLIB_REQUIRED_VERSION
+- gio-2.0 >= $GLIB_REQUIRED_VERSION
+-" 2>&1`
+- else
+- COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gobject-2.0 >= $GLIB_REQUIRED_VERSION
+- gio-2.0 >= $GLIB_REQUIRED_VERSION
+-" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$COMMON_PKG_ERRORS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
-+
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gobject-2.0 >= $GLIB_REQUIRED_VERSION
+- gio-2.0 >= $GLIB_REQUIRED_VERSION
+-) were not met:
+if test "$hardcode_action_CXX" = relink ||
+ test "$inherit_rpath_CXX" = yes; then
+ # Fast installation is not supported
@@ -41208,7 +41150,79 @@
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
- fi
++fi
+
+-$COMMON_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 COMMON_CFLAGS
+-and COMMON_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 (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gobject-2.0 >= $GLIB_REQUIRED_VERSION
+- gio-2.0 >= $GLIB_REQUIRED_VERSION
+-) were not met:
+
+-$COMMON_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 COMMON_CFLAGS
+-and COMMON_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$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 COMMON_CFLAGS
+-and COMMON_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
++ fi # test -n "$compiler"
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-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
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
++ CC=$lt_save_CC
++ LDCXX=$LD
++ LD=$lt_save_LD
++ GCC=$lt_save_GCC
++ with_gnu_ld=$lt_save_with_gnu_ld
++ lt_cv_path_LDCXX=$lt_cv_path_LD
++ lt_cv_path_LD=$lt_save_path_LD
++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++fi # test "$_lt_caught_CXX_error" != yes
+
+-Alternatively, you may set the environment variables COMMON_CFLAGS
+-and COMMON_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+-else
+- COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS
+- COMMON_LIBS=$pkg_cv_COMMON_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-fi
@@ -41269,19 +41283,8 @@
-fi
-+ fi # test -n "$compiler"
-if test $pkg_failed = yes; then
-+ CC=$lt_save_CC
-+ LDCXX=$LD
-+ LD=$lt_save_LD
-+ GCC=$lt_save_GCC
-+ with_gnu_ld=$lt_save_with_gnu_ld
-+ lt_cv_path_LDCXX=$lt_cv_path_LD
-+ lt_cv_path_LD=$lt_save_path_LD
-+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
@@ -41301,11 +41304,6 @@
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$DAEMON_PKG_ERRORS" >&5
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
- gobject-2.0 >= $GLIB_REQUIRED_VERSION
@@ -41316,6 +41314,7 @@
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
++ ac_config_commands="$ac_config_commands libtool"
-Alternatively, you may set the environment variables DAEMON_CFLAGS
-and DAEMON_LIBS to avoid the need to call pkg-config.
@@ -41342,6 +41341,7 @@
-{ { $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.
++# Only expand once:
-Alternatively, you may set the environment variables DAEMON_CFLAGS
-and DAEMON_LIBS to avoid the need to call pkg-config.
@@ -41356,29 +41356,79 @@
-Alternatively, you may set the environment variables DAEMON_CFLAGS
-and DAEMON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
++{ $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 :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_stdc=yes
++else
++ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "memchr" >/dev/null 2>&1; then :
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
--else
+ else
- DAEMON_CFLAGS=$pkg_cv_DAEMON_CFLAGS
- DAEMON_LIBS=$pkg_cv_DAEMON_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- :
--fi
-
-
-+ ac_config_commands="$ac_config_commands libtool"
++ ac_cv_header_stdc=no
+ fi
++rm -f conftest*
+
++fi
+
++if test $ac_cv_header_stdc = yes; then
++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "free" >/dev/null 2>&1; then :
+
++else
++ ac_cv_header_stdc=no
++fi
++rm -f conftest*
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then
- withval=$with_x;
--fi
+ fi
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
@@ -41390,14 +41440,11 @@
-$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
-+# Only expand once:
-+
-+
-+
-+{ $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 :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
++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 :
++ :
else
- # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
@@ -41411,7 +41458,33 @@
- @echo usrlibdir='${USRLIBDIR}'
-libdir:
- @echo libdir='${LIBDIR}'
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++ (('a' <= (c) && (c) <= 'i') \
++ || ('j' <= (c) && (c) <= 'r') \
++ || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
++ return 0;
++}
+ _ACEOF
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- for ac_var in incroot usrlibdir libdir; do
@@ -41438,8 +41511,15 @@
- fi
- cd ..
- rm -f -r conftest.dir
--fi
--
++if ac_fn_c_try_run "$LINENO"; then :
++
++else
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
@@ -41447,52 +41527,32 @@
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
++fi
++fi
++{ $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
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-+int
-+main ()
-+{
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_stdc=yes
-+else
-+ ac_cv_header_stdc=no
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <string.h>
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then :
-/usr/include
-/usr/local/include
@@ -41500,14 +41560,10 @@
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-/usr/openwin/include
-/usr/openwin/share/include'
-+fi
++ac_config_headers="$ac_config_headers config.h"
-if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
@@ -41517,14 +41573,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if test $ac_cv_header_stdc = yes; then
-+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <X11/Xlib.h>
-+#include <stdlib.h>
-+
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41544,15 +41595,9 @@
- }; then
- # We can compile using X headers with no special include directory.
-ac_x_includes=
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
@@ -41560,29 +41605,21 @@
- break
- fi
-done
++
++
++ { $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 :
++ enableval=$enable_nls; USE_NLS=$enableval
++else
++ USE_NLS=yes
fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-+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 :
-+ :
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
++$as_echo "$USE_NLS" >&6; }
-if test "$ac_x_libraries" = no; then
- # Check for the libraries.
@@ -41597,26 +41634,29 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/Xlib.h>
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int
- main ()
- {
+-int
+-main ()
+-{
-XrmInitialize ()
- ;
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ return 2;
- return 0;
- }
- _ACEOF
+- 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
++
++
++
++case "$am__api_version" in
++ 1.01234)
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
++ ;;
++ *)
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -41635,20 +41675,41 @@
- LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-+if ac_fn_c_try_run "$LINENO"; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
--do
++if test -n "0.40.0"; then
++ { $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:${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_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:${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 :
++ $as_echo_n "(cached) " >&6
++else
++ case $INTLTOOL_UPDATE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
+ do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl dylib la dll; do
- if test -r "$ac_dir/libX11.$ac_extension"; then
@@ -41656,123 +41717,6 @@
- break 2
- fi
- done
--done
- fi
-+fi
-+{ $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
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi # $ac_x_libraries = no
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
--case $ac_x_includes,$ac_x_libraries in #(
-- no,* | *,no | *\'*)
-- # Didn't find X, or a directory has "'" in its name.
-- ac_cv_have_x="have_x=no";; #(
-- *)
-- # Record where we found X for the cache.
-- ac_cv_have_x="have_x=yes\
-- ac_x_includes='$ac_x_includes'\
-- ac_x_libraries='$ac_x_libraries'"
--esac
- fi
--;; #(
-- *) have_x=yes;;
-- esac
-- eval "$ac_cv_have_x"
--fi # $with_x != no
-
--if test "$have_x" != yes; then
-- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
--$as_echo "$have_x" >&6; }
-- no_x=yes
-+
-+
-+
-+ac_config_headers="$ac_config_headers config.h"
-+
-+
-+
-+
-+ { $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 :
-+ enableval=$enable_nls; USE_NLS=$enableval
- else
-- # If each of the values was on the command line, it overrides each guess.
-- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-- # Update the cache value to reflect the command line values.
-- ac_cv_have_x="have_x=yes\
-- ac_x_includes='$x_includes'\
-- ac_x_libraries='$x_libraries'"
-- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-+ USE_NLS=yes
- fi
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-+$as_echo "$USE_NLS" >&6; }
-
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5
--$as_echo_n "checking for XLIB... " >&6; }
-
--if test -n "$XLIB_CFLAGS"; then
-- pkg_cv_XLIB_CFLAGS="$XLIB_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
-- ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null`
-+
-+
-+case "$am__api_version" in
-+ 1.01234)
-+ 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:${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:${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_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:${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 :
-+ $as_echo_n "(cached) " >&6
- else
-- pkg_failed=yes
-+ case $INTLTOOL_UPDATE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41781,15 +41725,13 @@
+ $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
+
+ ;;
+esac
- fi
-- else
-- pkg_failed=untried
++fi
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
@@ -41798,31 +41740,32 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
--if test -n "$XLIB_LIBS"; then
-- pkg_cv_XLIB_LIBS="$XLIB_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
-- ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null`
-+
-+
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi # $ac_x_libraries = no
+
+-case $ac_x_includes,$ac_x_libraries in #(
+- no,* | *,no | *\'*)
+- # Didn't find X, or a directory has "'" in its name.
+- ac_cv_have_x="have_x=no";; #(
+# 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:${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 :
+ $as_echo_n "(cached) " >&6
- else
-- pkg_failed=yes
++else
+ case $INTLTOOL_MERGE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+ ;;
-+ *)
+ *)
+- # Record where we found X for the cache.
+- ac_cv_have_x="have_x=yes\
+- ac_x_includes='$ac_x_includes'\
+- ac_x_libraries='$ac_x_libraries'"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
@@ -41839,27 +41782,62 @@
+IFS=$as_save_IFS
+
+ ;;
-+esac
+ esac
fi
-- else
-- pkg_failed=untried
+-;; #(
+- *) have_x=yes;;
+- esac
+- eval "$ac_cv_have_x"
+-fi # $with_x != no
+-
+-if test "$have_x" != yes; then
+- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+-$as_echo "$have_x" >&6; }
+- no_x=yes
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+$as_echo "$INTLTOOL_MERGE" >&6; }
-+else
+ else
+- # If each of the values was on the command line, it overrides each guess.
+- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+- # Update the cache value to reflect the command line values.
+- ac_cv_have_x="have_x=yes\
+- ac_x_includes='$x_includes'\
+- ac_x_libraries='$x_libraries'"
+- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+-pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5
+-$as_echo_n "checking for XLIB... " >&6; }
+-
+-if test -n "$XLIB_CFLAGS"; then
+- pkg_cv_XLIB_CFLAGS="$XLIB_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
+- ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null`
+# 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:${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 :
+ $as_echo_n "(cached) " >&6
-+else
+ else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+ case $INTLTOOL_EXTRACT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
@@ -41879,43 +41857,37 @@
+done
+ done
+IFS=$as_save_IFS
-
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
++
+ ;;
+esac
-+fi
+ fi
+-if test -n "$XLIB_LIBS"; then
+- pkg_cv_XLIB_LIBS="$XLIB_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
+- ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null`
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
else
-- _pkg_short_errors_supported=no
+- pkg_failed=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-- if test $_pkg_short_errors_supported = yes; then
-- XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xau" 2>&1`
-- else
-- XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xau" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$XLIB_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- 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
+- else
+- pkg_failed=untried
++
++
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-+fi
-+
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -41955,6 +41927,38 @@
+
+
+
++
++
++
++
++
++
++
+
+
+-if test $pkg_failed = yes; then
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xau" 2>&1`
+- else
+- XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xau" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$XLIB_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- 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
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
@@ -42615,8 +42619,30 @@
- { $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
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# 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:${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 :
+ $as_echo_n "(cached) " >&6
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -42625,6 +42651,25 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ case $XGETTEXT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42646,7 +42691,8 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -42663,23 +42709,67 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_socket_connect=yes
--else
++fi
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_lib_socket_connect=no
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 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
++
++# 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:${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 :
++ $as_echo_n "(cached) " >&6
++else
++ case $MSGMERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
+ 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"
--fi
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
++$as_echo "$MSGMERGE" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
- fi
@@ -42687,8 +42777,13 @@
- { $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
++# 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:${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 :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -42698,17 +42793,47 @@
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define remove innocuous_remove
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ case $MSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ ;;
++esac
++fi
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
++$as_echo "$MSGFMT" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
-#undef remove
@@ -42725,6 +42850,32 @@
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
++# 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:${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 :
++ $as_echo_n "(cached) " >&6
++else
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
-int
-main ()
@@ -42739,7 +42890,9 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -42756,17 +42909,32 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_remove=yes
--else
++fi
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
++$as_echo "$GMSGFMT" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_func_remove=no
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ 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`"
++if test -z "$xgversion" -o -z "$mmversion"; then
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
@@ -42774,27 +42942,11 @@
- { $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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# 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
++# 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:${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_INTLTOOL_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -42805,9 +42957,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ case $XGETTEXT in
++ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -42817,7 +42969,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -42868,21 +43020,21 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
- fi
+-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
+ 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"
-+XGETTEXT=$ac_cv_path_XGETTEXT
-+if test -n "$XGETTEXT"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
++$as_echo "$INTLTOOL_PERL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
@@ -42894,12 +43046,15 @@
- { $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
-+# 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:${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 :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
++if test -z "$INTLTOOL_PERL"; then
++ as_fn_error "perl not found" "$LINENO" 5
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
++$as_echo_n "checking for perl >= 5.8.1... " >&6; }
++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
++if test $? -ne 0; then
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -42915,42 +43070,27 @@
- which can conflict with char shmat (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ case $MSGMERGE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
++$as_echo "$IT_PERL_VERSION" >&6; }
++fi
++if test "x" != "xno-xml"; then
++ { $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:${as_lineno-$LINENO}: result: ok" >&5
++$as_echo "ok" >&6; }
++ else
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
++ fi
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ ;;
-+esac
-+fi
-+MSGMERGE=$ac_cv_path_MSGMERGE
-+if test -n "$MSGMERGE"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-+$as_echo "$MSGMERGE" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
-#undef shmat
@@ -42967,16 +43107,106 @@
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ int
+ main ()
+ {
+-return shmat ();
++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_shmat=yes
++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
+-
+- ac_cv_func_shmat=no
++ 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 :
++ DATADIRNAME=share
++else
++ DATADIRNAME=lib
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ ;;
++ *)
++ DATADIRNAME=lib
++ ;;
++ esac
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ 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
++
++
++
++
++
++
++
++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_MSGFMT+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $MSGFMT in
++if test "${ac_cv_path_PKG_CONFIG+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. */
++ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -42986,7 +43216,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -42994,6 +43224,13 @@
+ done
+IFS=$as_save_IFS
+-/* 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 ()
-{
@@ -43024,142 +43261,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_shmat=yes
-+fi
-+MSGFMT=$ac_cv_path_MSGFMT
-+if test -n "$MSGFMT"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shmat=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 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
-+# 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:${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 :
- $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. */
-+ case $GMSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
--/* 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;;
-+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+ ;;
- 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_ipc_shmat=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ipc_shmat=no
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-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
-+
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
-{ $as_echo "$as_me:$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
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion"; then
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
- fi
- fi
--
+
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
@@ -43172,11 +43302,14 @@
- { $as_echo "$as_me:$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
-+# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -43187,9 +43320,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ case $INTLTOOL_PERL in
++ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -43199,7 +43332,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -43246,10 +43379,10 @@
- }; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
+fi
-+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-+if test -n "$INTLTOOL_PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-+$as_echo "$INTLTOOL_PERL" >&6; }
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -43263,36 +43396,41 @@
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+
-+if test -z "$INTLTOOL_PERL"; then
-+ as_fn_error "perl not found" "$LINENO" 5
- fi
+-fi
-{ $as_echo "$as_me:$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
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-+$as_echo "$IT_PERL_VERSION" >&6; }
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
--
+
- LDFLAGS=$ac_save_LDFLAGS
--
-+if test "x" != "xno-xml"; then
-+ { $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:${as_lineno-$LINENO}: result: ok" >&5
-+$as_echo "ok" >&6; }
-+ else
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
-+ fi
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ PKG_CONFIG=""
++ fi
+
fi
- if test "x$no_x" = xyes; then
@@ -43306,17 +43444,37 @@
-elif test $pkg_failed = untried; then
- if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
--
++gdu_cv_version_required=0.3.2
+
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
++$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
++if test -n "$PKG_CONFIG" && \
++ { { $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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ gdu_cv_have_gdu=yes
++else
++ gdu_cv_have_gdu=no
++fi
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
--else
++if test "$gdu_cv_have_gdu" = "yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
+ else
- if test -n "$x_includes"; then
- X_CFLAGS="$X_CFLAGS -I$x_includes"
- fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
++fi
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
@@ -43333,22 +43491,16 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- main ()
- {
--
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -43373,18 +43525,13 @@
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ DATADIRNAME=share
++# Check whether --with-help-dir was given.
++if test "${with_help_dir+set}" = set; then :
++ withval=$with_help_dir;
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ 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 :
-+ DATADIRNAME=share
-+else
-+ DATADIRNAME=lib
++ with_help_dir='${datadir}/gnome/help'
+fi
- LIBS="$ac_xsave_LIBS -R $x_libraries"
@@ -43394,15 +43541,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
++HELP_DIR="$with_help_dir"
-int
-main ()
@@ -43442,12 +43581,26 @@
- { $as_echo "$as_me:$LINENO: result: neither works" >&5
-$as_echo "neither works" >&6; }
--fi
++# Check whether --with-omf-dir was given.
++if test "${with_omf_dir+set}" = set; then :
++ withval=$with_omf_dir;
++else
++ with_omf_dir='${datadir}/omf'
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++OMF_DIR="$with_omf_dir"
++
++
++
++# Check whether --with-help-formats was given.
++if test "${with_help_formats+set}" = set; then :
++ withval=$with_help_formats;
++else
++ with_help_formats=''
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -43455,6 +43608,7 @@
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
- fi
++DOC_USER_FORMATS="$with_help_formats"
- # Check for system-dependent libraries X programs must link with.
- # Do this before checking for the system-independent R6 libraries
@@ -43473,6 +43627,12 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++# Check whether --enable-scrollkeeper was given.
++if test "${enable_scrollkeeper+set}" = set; then :
++ enableval=$enable_scrollkeeper;
++else
++ enable_scrollkeeper=yes
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43511,90 +43671,48 @@
- $as_test_x conftest$ac_exeext
- }; 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
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
++ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
++ ENABLE_SK_TRUE=
++ ENABLE_SK_FALSE='#'
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ ENABLE_SK_TRUE='#'
++ ENABLE_SK_FALSE=
+fi
- { $as_echo "$as_me:$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
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ ac_pt_PKG_CONFIG=$PKG_CONFIG
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
++
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++
++
++ if test "$gdu_cv_have_gdu" = "yes"; then
++ HAVE_GNOME_DOC_UTILS_TRUE=
++ HAVE_GNOME_DOC_UTILS_FALSE='#'
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ HAVE_GNOME_DOC_UTILS_TRUE='#'
++ HAVE_GNOME_DOC_UTILS_FALSE=
++fi
++
++
++
++
++GETTEXT_PACKAGE=gdm
++
++
++cat >>confdefs.h <<_ACEOF
++#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43610,278 +43728,15 @@
- ;
- 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_dnet_dnet_ntoa=yes
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-- ac_cv_lib_dnet_dnet_ntoa=no
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
-+else
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
- fi
-
--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_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
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ PKG_CONFIG=""
-+ fi
-+
- fi
-
-- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- { $as_echo "$as_me:$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
-- $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
--/* end confdefs.h. */
-+gdu_cv_version_required=0.3.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 dnet_ntoa ();
--int
--main ()
--{
--return dnet_ntoa ();
-- ;
-- 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
-+if test -n "$PKG_CONFIG" && \
-+ { { $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=$?
-- 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_dnet_stub_dnet_ntoa=yes
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ gdu_cv_have_gdu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ gdu_cv_have_gdu=no
-+fi
-
-- ac_cv_lib_dnet_stub_dnet_ntoa=no
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
- 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
-+
-+
-+# Check whether --with-help-dir was given.
-+if test "${with_help_dir+set}" = set; then :
-+ withval=$with_help_dir;
-+else
-+ with_help_dir='${datadir}/gnome/help'
- fi
--{ $as_echo "$as_me:$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
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+
-+HELP_DIR="$with_help_dir"
-+
-+
-+
-+# Check whether --with-omf-dir was given.
-+if test "${with_omf_dir+set}" = set; then :
-+ withval=$with_omf_dir;
-+else
-+ with_omf_dir='${datadir}/omf'
- fi
-
-- fi
-+OMF_DIR="$with_omf_dir"
-+
-+
-+
-+# Check whether --with-help-formats was given.
-+if test "${with_help_formats+set}" = set; then :
-+ withval=$with_help_formats;
-+else
-+ with_help_formats=''
- 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_xsave_LIBS"
-+DOC_USER_FORMATS="$with_help_formats"
-
-- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-- # to get the SysV transport functions.
-- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-- # needs -lnsl.
-- # The nsl library prevents programs from opening the X display
-- # 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
-+
-+# Check whether --enable-scrollkeeper was given.
-+if test "${enable_scrollkeeper+set}" = set; then :
-+ enableval=$enable_scrollkeeper;
- 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 <limits.h> declares gethostbyname.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define gethostbyname innocuous_gethostbyname
-+ enable_scrollkeeper=yes
-+fi
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char gethostbyname (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-+ ENABLE_SK_TRUE=
-+ ENABLE_SK_FALSE='#'
-+else
-+ ENABLE_SK_TRUE='#'
-+ ENABLE_SK_FALSE=
-+fi
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef gethostbyname
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-
--/* 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
++
++
++ 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 HAVE_LOCALE_H 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -43903,52 +43758,30 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_gethostbyname=yes
-+ if test "$gdu_cv_have_gdu" = "yes"; then
-+ HAVE_GNOME_DOC_UTILS_TRUE=
-+ HAVE_GNOME_DOC_UTILS_FALSE='#'
- else
+- ac_cv_lib_dnet_dnet_ntoa=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ HAVE_GNOME_DOC_UTILS_TRUE='#'
-+ HAVE_GNOME_DOC_UTILS_FALSE=
-+fi
-+
-+
-+
-+
-+GETTEXT_PACKAGE=gdm
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-+_ACEOF
-
-- ac_cv_func_gethostbyname=no
--fi
+
+- 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
-+
-+ 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 HAVE_LOCALE_H 1
-+_ACEOF
-+
- 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_n "checking for gethostbyname in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$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
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+-fi
+done
-+
+
+- 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_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_header_locale_h = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
@@ -43956,7 +43789,7 @@
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
+-LIBS="-ldnet_stub $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -43971,12 +43804,12 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char gethostbyname ();
+-char dnet_ntoa ();
+#include <locale.h>
int
main ()
{
--return gethostbyname ();
+-return dnet_ntoa ();
+return LC_MESSAGES
;
return 0;
@@ -44003,72 +43836,98 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_nsl_gethostbyname=yes
+- ac_cv_lib_dnet_stub_dnet_ntoa=yes
+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
-
-- ac_cv_lib_nsl_gethostbyname=no
-+ am_cv_val_LC_MESSAGES=no
- fi
+- 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
-LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$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
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
++ am_cv_val_LC_MESSAGES=no
+ fi
+-{ $as_echo "$as_me:$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
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
+{ $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
-
-- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- { $as_echo "$as_me:$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
++
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-+
-+ fi
+
+ fi
+-fi
+ fi
+ USE_NLS=yes
-+
-+
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$ac_xsave_LIBS"
+
+- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+- # to get the SysV transport functions.
+- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+- # needs -lnsl.
+- # The nsl library prevents programs from opening the X display
+- # 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 <limits.h> declares gethostbyname.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define gethostbyname innocuous_gethostbyname
+ gt_cv_have_gettext=no
-+
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char gethostbyname (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 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=""
-+
+
+-#undef gethostbyname
+ #
+ # First check in libc
+ #
+ { $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 :
- $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
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -44077,8 +43936,14 @@
-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
+#include <libintl.h>
-+
+
int
main ()
{
@@ -44109,14 +43974,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_bsd_gethostbyname=yes
+- ac_cv_func_gethostbyname=yes
+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
-
-- ac_cv_lib_bsd_gethostbyname=no
+- ac_cv_func_gethostbyname=no
+ gt_cv_func_ngettext_libc=no
fi
+rm -f core conftest.err conftest.$ac_objext \
@@ -44125,16 +43990,203 @@
-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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
++$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+- if test $ac_cv_func_gethostbyname = no; then
+- { $as_echo "$as_me:$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 "$gt_cv_func_ngettext_libc" = "yes" ; then
++ { $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 :
+ $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.
+- 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 ();
++#include <libintl.h>
++
+ int
+ main ()
+ {
+-return gethostbyname ();
++return !dgettext ("","")
+ ;
+ 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_nsl_gethostbyname=yes
++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
+-
+- ac_cv_lib_nsl_gethostbyname=no
++ gt_cv_func_dgettext_libc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+-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
+ fi
+-{ $as_echo "$as_me:$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
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
++{ $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 :
++ 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 HAVE_BIND_TEXTDOMAIN_CODESET 1
++_ACEOF
++
+ fi
++done
+
+- if test $ac_cv_lib_nsl_gethostbyname = no; then
+- { $as_echo "$as_me:$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
++ 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
++
++ { $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 :
+ $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
++LIBS="-lintl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25465,92 +16130,36 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char gethostbyname ();
++char bindtextdomain ();
+ 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_lib_bsd_gethostbyname=yes
++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_bsd_gethostbyname=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_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-
+-fi
+-
- fi
- fi
-
@@ -44148,10 +44200,12 @@
- { $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
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ { $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 :
++{ $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:${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 :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -44159,7 +44213,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
@@ -44169,7 +44225,7 @@
- which can conflict with char connect (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -44177,13 +44233,13 @@
-#endif
-
-#undef connect
--
--/* 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
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -25558,71 +16167,35 @@
+ #ifdef __cplusplus
+ 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
@@ -44191,13 +44247,13 @@
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-+#include <libintl.h>
-
+-
++char ngettext ();
int
main ()
{
-return connect ();
-+return !dgettext ("","")
++return ngettext ();
;
return 0;
}
@@ -44225,54 +44281,35 @@
- }; then
- ac_cv_func_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ gt_cv_func_dgettext_libc=yes
++ ac_cv_lib_intl_ngettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ gt_cv_func_dgettext_libc=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
- ac_cv_func_connect=no
++ ac_cv_lib_intl_ngettext=no
fi
-+{ $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 :
-+ 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 HAVE_BIND_TEXTDOMAIN_CODESET 1
-+_ACEOF
-
+-
-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_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
-+done
-
+-
- 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
-+ 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
-+
-+ { $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 :
++{ $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:${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 :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -44287,17 +44324,17 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25631,85 +16122,36 @@
+@@ -25631,85 +16204,49 @@
#ifdef __cplusplus
extern "C"
#endif
-char connect ();
-+char bindtextdomain ();
++char dgettext ();
int
main ()
{
-return connect ();
-+return bindtextdomain ();
++return dgettext ();
;
return 0;
}
@@ -44325,13 +44362,13 @@
- }; then
- ac_cv_lib_socket_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_bindtextdomain=yes
++ ac_cv_lib_intl_dgettext=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_intl_bindtextdomain=no
++ ac_cv_lib_intl_dgettext=no
fi
-
-rm -rf conftest.dSYM
@@ -44345,18 +44382,28 @@
-$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
--
++{ $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 :
++ gt_cv_func_dgettext_libintl=yes
+ fi
+
- 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 "$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:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
++fi
++
++
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ { $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:${as_lineno-$LINENO}: result: " >&5
++$as_echo "" >&6; }
++ { $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 :
$as_echo_n "(cached) " >&6
@@ -44367,7 +44414,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl $LIBS"
++LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
@@ -44389,7 +44436,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25717,71 +16159,35 @@
+@@ -25717,71 +16254,35 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44408,9 +44455,9 @@
-return remove ();
+return ngettext ();
;
-- return 0;
--}
--_ACEOF
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -44433,9 +44480,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_remove=yes
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
else
@@ -44463,9 +44507,9 @@
+{ $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:${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 :
++ { $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 :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -44475,22 +44519,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lintl $LIBS"
++LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25790,85 +16196,49 @@
+@@ -25790,481 +16291,551 @@
#ifdef __cplusplus
extern "C"
#endif
-char remove ();
-+char dgettext ();
++char dcgettext ();
int
main ()
{
-return remove ();
-+return dgettext ();
++return dcgettext ();
;
return 0;
}
@@ -44518,191 +44562,10 @@
- }; then
- ac_cv_lib_posix_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_dgettext=yes
++ ac_cv_lib_intl_dcgettext=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_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_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"
-+{ $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 :
-+ gt_cv_func_dgettext_libintl=yes
- fi
-
-- 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
-+fi
-+
-+
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ { $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:${as_lineno-$LINENO}: result: " >&5
-+$as_echo "" >&6; }
-+ { $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 :
- $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="-lintl -liconv $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shmat innocuous_shmat
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shmat
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -25876,71 +16246,35 @@
- #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
--
-+char ngettext ();
- int
- main ()
- {
--return shmat ();
-+return ngettext ();
- ;
- 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
-+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_func_shmat=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_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 "$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:${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 :
- $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
-+LIBS="-lintl -liconv $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -25949,444 +16283,549 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char shmat ();
-+char dcgettext ();
- int
- main ()
- {
--return shmat ();
-+return dcgettext ();
- ;
- 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;;
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_dcgettext=yes
-+else
+ ac_cv_lib_intl_dcgettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
@@ -44717,11 +44580,16 @@
+else
+ :
+fi
-+
+
+- ac_cv_lib_posix_remove=no
+else
+ :
-+fi
-+
+ 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
+
+ #
@@ -44741,7 +44609,11 @@
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+_ACEOF
+
-+fi
+ 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"
+done
+
+ LIBS="$glib_save_LIBS"
@@ -44795,31 +44667,23 @@
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+ ;;
- 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_ipc_shmat=yes
-+fi
++esac
+ 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
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
@@ -44832,16 +44696,46 @@
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DCGETTEXT 1
-+_ACEOF
-+
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shmat innocuous_shmat
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shmat (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+fi
+done
-+
+
+-#undef shmat
+ MSGFMT_OPTS=
+ { $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
-+
+
+-/* 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
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
@@ -44852,11 +44746,38 @@
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
-- ac_cv_lib_ipc_shmat=no
-+_ACEOF
+-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
+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=$?
+ 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
+ $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
@@ -44865,19 +44786,17 @@
+$as_echo "no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
- 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
++
+ # 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:${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 :
+ $as_echo_n "(cached) " >&6
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
@@ -44897,15 +44816,16 @@
+done
+ done
+IFS=$as_save_IFS
-+
+
+- ac_cv_func_shmat=no
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
fi
--{ $as_echo "$as_me:$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
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
@@ -44914,22 +44834,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
-- fi
-- fi
-
-- # Check for libraries that X11R6 Xt/Xaw programs need.
-- ac_save_LDFLAGS=$LDFLAGS
-- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-- # check for ICE first), but we must link in the order -lSM -lICE or
-- # we get undefined symbols. So assume we have SM if we have ICE.
-- # 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_n "checking for IceConnectionNumber in -lICE... " >&6; }
--if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+-{ $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
++
+ # 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -44938,7 +44850,7 @@
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-LIBS="-lipc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -44982,11 +44894,11 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char IceConnectionNumber ();
+-char shmat ();
int
main ()
{
--return IceConnectionNumber ();
+-return shmat ();
+extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
;
@@ -45014,7 +44926,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ICE_IceConnectionNumber=yes
+- ac_cv_lib_ipc_shmat=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
@@ -45022,7 +44934,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_ICE_IceConnectionNumber=no
+- ac_cv_lib_ipc_shmat=no
+ case $host in
+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
@@ -45045,10 +44957,10 @@
+ ;;
+ esac
fi
--{ $as_echo "$as_me:$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
-- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+-{ $as_echo "$as_me:$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
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
@@ -45060,9 +44972,112 @@
+
fi
+- fi
+- fi
+
+- # Check for libraries that X11R6 Xt/Xaw programs need.
+- ac_save_LDFLAGS=$LDFLAGS
+- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+- # check for ICE first), but we must link in the order -lSM -lICE or
+- # we get undefined symbols. So assume we have SM if we have ICE.
+- # 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_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-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
+-/* 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 IceConnectionNumber ();
+-int
+-main ()
+-{
+-return IceConnectionNumber ();
+- ;
+- 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_ICE_IceConnectionNumber=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ if test "$gt_cv_have_gettext" = "yes" ; then
++
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
++
++ fi
++
++ if test "$XGETTEXT" != ":"; then
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ { $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
++ fi
+
+- ac_cv_lib_ICE_IceConnectionNumber=no
+-fi
++ # We need to process the po/ directory.
++ POSUB=po
+
+-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_ICE_IceConnectionNumber" >&5
+-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+-fi
++ ac_config_commands="$ac_config_commands default-1"
+
- LDFLAGS=$ac_save_LDFLAGS
-fi
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
- if test "x$no_x" = xyes; then
- { { $as_echo "$as_me:$LINENO: error: \"no (requires X development libraries)\"" >&5
@@ -45079,29 +45094,13 @@
-$as_echo "yes" >&6; }
- :
-fi
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-+
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-+ fi
-
-+ if test "$XGETTEXT" != ":"; then
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ { $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
-+ fi
-
-+ # We need to process the po/ directory.
-+ POSUB=po
+
+
+
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
-+ ac_config_commands="$ac_config_commands default-1"
-if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
@@ -45142,10 +45141,6 @@
- pkg_failed=untried
-fi
-+ for lang in $ALL_LINGUAS; do
-+ GMOFILES="$GMOFILES $lang.gmo"
-+ POFILES="$POFILES $lang.po"
-+ done
-if test $pkg_failed = yes; then
@@ -45172,44 +45167,6 @@
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables GTK_CFLAGS
--and GTK_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_VERSION
--) were not met:
-
--$GTK_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 GTK_CFLAGS
--and GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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 GTK_CFLAGS
--and GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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
--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 GTK_CFLAGS
--and GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -45243,21 +45200,18 @@
+$as_echo "$LINGUAS" >&6; }
+ fi
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
--else
-- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-- GTK_LIBS=$pkg_cv_GTK_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
--fi
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_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_VERSION
+-) were not met:
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+-$GTK_PKG_ERRORS
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -45266,7 +45220,20 @@
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$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.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -45281,50 +45248,22 @@
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for CANBERRA_GTK" >&5
--$as_echo_n "checking for CANBERRA_GTK... " >&6; }
-
--if test -n "$CANBERRA_GTK_CFLAGS"; then
-- pkg_cv_CANBERRA_GTK_CFLAGS="$CANBERRA_GTK_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
--\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$CANBERRA_GTK_LIBS"; then
-- pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
--\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
-
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-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
+-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 GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+DBUS_GLIB_REQUIRED_VERSION=0.74
++POLKIT_GOBJECT_REQUIRED_VERSION=0.92
++POLKIT_GTK_REQUIRED_VERSION=0.92
+GLIB_REQUIRED_VERSION=2.22.0
+GTK_REQUIRED_VERSION=2.12.0
+PANGO_REQUIRED_VERSION=1.3.0
@@ -45337,50 +45276,32 @@
+FONTCONFIG_REQUIRED_VERSION=2.5.0
+DEVKIT_POWER_REQUIRED_VERSION=008
-
--if test $pkg_failed = yes; then
-
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++
++
+ # Check whether --enable-compile-warnings was given.
+if test "${enable_compile_warnings+set}" = set; then :
+ enableval=$enable_compile_warnings;
else
-- _pkg_short_errors_supported=no
+- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+- GTK_LIBS=$pkg_cv_GTK_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+ enable_compile_warnings="yes"
- fi
-- if test $_pkg_short_errors_supported = yes; then
-- CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--" 2>&1`
-- else
-- CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$CANBERRA_GTK_PKG_ERRORS" >&5
--
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--) were not met:
-
--$CANBERRA_GTK_PKG_ERRORS
-
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
++fi
++
++
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
-
--Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
--and CANBERRA_GTK_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 (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
--) were not met:
++
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
-
--$CANBERRA_GTK_PKG_ERRORS
++
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -45401,24 +45322,11 @@
+$as_echo_n "checking whether gcc understands $option... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
++
+int
+main ()
+{
-
--Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
--and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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.
++
+ ;
+ return 0;
+}
@@ -45452,26 +45360,15 @@
+$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
+$as_echo "$warning_flags" >&6; }
-
--Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
--and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
++
+ # Check whether --enable-iso-c was given.
+if test "${enable_iso_c+set}" = set; then :
+ enableval=$enable_iso_c;
+else
+ enable_iso_c=no
-+fi
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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
--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 CANBERRA_GTK_CFLAGS
--and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+ fi
+
+
+ { $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=
@@ -45489,35 +45386,25 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
+$as_echo "$complCFLAGS" >&6; }
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
--else
-- CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS
-- CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
--fi
++
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-
++
++
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5
--$as_echo_n "checking for GCONF... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for CANBERRA_GTK" >&5
+-$as_echo_n "checking for CANBERRA_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
--if test -n "$GCONF_CFLAGS"; then
-- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
+-if test -n "$CANBERRA_GTK_CFLAGS"; then
+- pkg_cv_CANBERRA_GTK_CFLAGS="$CANBERRA_GTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
-\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+- ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GTHREAD_CFLAGS"; then
@@ -45529,11 +45416,181 @@
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+- pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$CANBERRA_GTK_LIBS"; then
+- pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
+-\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GTHREAD_LIBS"; then
++ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26277,68 +16848,41 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-" 2>&1`
++ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"`
+ else
+- CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-" 2>&1`
++ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$CANBERRA_GTK_PKG_ERRORS" >&5
+-
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-) were not met:
+-
+-$CANBERRA_GTK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++ echo "$GTHREAD_PKG_ERRORS" >&5
+
+-Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
+-and CANBERRA_GTK_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 (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
+-) were not met:
++ as_fn_error "Package requirements (gthread-2.0) were not met:
+
+-$CANBERRA_GTK_PKG_ERRORS
++$GTHREAD_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 CANBERRA_GTK_CFLAGS
+-and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTHREAD_CFLAGS
++and GTHREAD_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
++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.
+
+-Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
+-and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-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
+-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 CANBERRA_GTK_CFLAGS
+-and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTHREAD_CFLAGS
++and GTHREAD_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+- CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS
+- CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
++ GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -26347,46 +16891,68 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5
+-$as_echo_n "checking for GCONF... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMON" >&5
++$as_echo_n "checking for COMMON... " >&6; }
+
+-if test -n "$GCONF_CFLAGS"; then
+- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
+-\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
++if test -n "$PKG_CONFIG"; then
++ if test -n "$COMMON_CFLAGS"; then
++ pkg_cv_COMMON_CFLAGS="$COMMON_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
++ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ ") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_COMMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -45550,22 +45607,32 @@
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
-\"") >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
--") 2>&5
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTHREAD_LIBS"; then
-+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
++ if test -n "$COMMON_LIBS"; then
++ pkg_cv_COMMON_LIBS="$COMMON_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
++ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ ") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION
--" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
++ pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -45577,17 +45644,25 @@
fi
-@@ -26399,68 +16838,41 @@
+@@ -26399,68 +16965,53 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-" 2>&1`
-+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"`
++ COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
++"`
else
- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-" 2>&1`
-+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"`
++ COMMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
++"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GCONF_PKG_ERRORS" >&5
@@ -45599,26 +45674,29 @@
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-+ echo "$GTHREAD_PKG_ERRORS" >&5
++ echo "$COMMON_PKG_ERRORS" >&5
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_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 (gconf-2.0 >= $GCONF_REQUIRED_VERSION
--) were not met:
-+ as_fn_error "Package requirements (gthread-2.0) were not met:
++ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
++ gobject-2.0 >= $GLIB_REQUIRED_VERSION
++ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ ) were not met:
-$GCONF_PKG_ERRORS
-+$GTHREAD_PKG_ERRORS
++$COMMON_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 GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables GTHREAD_CFLAGS
-+and GTHREAD_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables COMMON_CFLAGS
++and COMMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
@@ -45644,8 +45722,8 @@
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables GTHREAD_CFLAGS
-+and GTHREAD_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables COMMON_CFLAGS
++and COMMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -45656,158 +45734,81 @@
- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
- GCONF_LIBS=$pkg_cv_GCONF_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
-+ GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
++ COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS
++ COMMON_LIBS=$pkg_cv_COMMON_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
-@@ -26469,40 +16881,62 @@
+@@ -26469,150 +17020,68 @@
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DEVKIT_POWER" >&5
-$as_echo_n "checking for DEVKIT_POWER... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMON" >&5
-+$as_echo_n "checking for COMMON... " >&6; }
-
+-
-if test -n "$DEVKIT_POWER_CFLAGS"; then
- pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$COMMON_CFLAGS"; then
-+ pkg_cv_COMMON_CFLAGS="$COMMON_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+") 2>&5
- ac_status=$?
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>/dev/null`
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_COMMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+-else
+- pkg_failed=yes
+-fi
- else
- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
+-fi
-if test -n "$DEVKIT_POWER_LIBS"; then
- pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$COMMON_LIBS"; then
-+ pkg_cv_COMMON_LIBS="$COMMON_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+") 2>&5
- ac_status=$?
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_DEVKIT_POWER_LIBS=`$PKG_CONFIG --libs "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>/dev/null`
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+-else
+- pkg_failed=yes
+-fi
- else
- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -26515,104 +16949,114 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>&1`
-+ COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+"`
- else
+- else
- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>&1`
-+ COMMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+"`
- fi
- # Put the nasty error message in config.log where it belongs
+- fi
+- # Put the nasty error message in config.log where it belongs
- echo "$DEVKIT_POWER_PKG_ERRORS" >&5
-+ echo "$COMMON_PKG_ERRORS" >&5
-+
-+ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+ gio-2.0 >= $GLIB_REQUIRED_VERSION
-+) were not met:
-
+-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- have_devicekit_power=no
-+$COMMON_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 COMMON_CFLAGS
-+and COMMON_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
+-
+-elif test $pkg_failed = untried; then
- have_devicekit_power=no
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+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.
-+
-+Alternatively, you may set the environment variables COMMON_CFLAGS
-+and COMMON_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
- else
+-
+-else
- DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
- DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS
-+ COMMON_LIBS=$pkg_cv_COMMON_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+-$as_echo "yes" >&6; }
- have_devicekit_power=yes
-fi
-if test "x$have_devicekit_power" = "xyes" ; then
@@ -45816,14 +45817,13 @@
-#define HAVE_DEVICEKIT_POWER /**/
-_ACEOF
-
-+ :
- fi
-
-
-
-
--
- pkg_failed=no
+-fi
+-
+-
+-
+-
+-
+-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SIMPLE_GREETER" >&5
-$as_echo_n "checking for SIMPLE_GREETER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAEMON" >&5
@@ -45845,6 +45845,7 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+\""; } >&5
@@ -45853,6 +45854,7 @@
- gconf-2.0 >= $GCONF_REQUIRED_VERSION
- fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- x11
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
") 2>&5
@@ -45867,6 +45869,7 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
@@ -45895,6 +45898,7 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+\""; } >&5
@@ -45903,6 +45907,7 @@
- gconf-2.0 >= $GCONF_REQUIRED_VERSION
- fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- x11
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
") 2>&5
@@ -45917,6 +45922,7 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
@@ -45931,7 +45937,7 @@
fi
-@@ -26625,127 +17069,289 @@
+@@ -26625,231 +17094,292 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -45942,6 +45948,7 @@
- x11
-" 2>&1`
+ DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+"`
@@ -45953,6 +45960,7 @@
- x11
-" 2>&1`
+ DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+"`
@@ -45983,6 +45991,7 @@
- fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- x11
+ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
) were not met:
@@ -46006,6 +46015,16 @@
+ { { $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 SIMPLE_GREETER_CFLAGS
+-and SIMPLE_GREETER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-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.
@@ -46017,41 +46036,69 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
-+else
+ else
+- SIMPLE_GREETER_CFLAGS=$pkg_cv_SIMPLE_GREETER_CFLAGS
+- SIMPLE_GREETER_LIBS=$pkg_cv_SIMPLE_GREETER_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ DAEMON_CFLAGS=$pkg_cv_DAEMON_CFLAGS
+ DAEMON_LIBS=$pkg_cv_DAEMON_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-
--Alternatively, you may set the environment variables SIMPLE_GREETER_CFLAGS
--and SIMPLE_GREETER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+
+ $as_echo "yes" >&6; }
+ :
+ fi
+-SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
-+
-+
+
+-pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBXKLAVIER" >&5
+-$as_echo_n "checking for LIBXKLAVIER... " >&6; }
+
+-if test -n "$LIBXKLAVIER_CFLAGS"; then
+- pkg_cv_LIBXKLAVIER_CFLAGS="$LIBXKLAVIER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxklavier >= \$LIBXKLAVIER_REQUIRED_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBXKLAVIER_CFLAGS=`$PKG_CONFIG --cflags "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+ withval=$with_x;
-+fi
+ fi
+-if test -n "$LIBXKLAVIER_LIBS"; then
+- pkg_cv_LIBXKLAVIER_LIBS="$LIBXKLAVIER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxklavier >= \$LIBXKLAVIER_REQUIRED_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBXKLAVIER_LIBS=`$PKG_CONFIG --libs "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>/dev/null`
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
-+else
+ else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+ case $x_includes,$x_libraries in #(
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
@@ -46096,8 +46143,8 @@
+ fi
+ cd ..
+ rm -f -r conftest.dir
-+fi
-+
+ fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
@@ -46112,23 +46159,41 @@
+/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
-+
+
+-if test $pkg_failed = yes; then
+/usr/local/include/X11
+/usr/local/include/X11R7
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
-+
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- LIBXKLAVIER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>&1`
+- else
+- LIBXKLAVIER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$LIBXKLAVIER_PKG_ERRORS" >&5
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
-+
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- have_libxklavier=no
+-elif test $pkg_failed = untried; then
+- have_libxklavier=no
+/usr/include
+/usr/local/include
+/usr/unsupported/include
@@ -46149,17 +46214,25 @@
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
-+else
+ else
+- LIBXKLAVIER_CFLAGS=$pkg_cv_LIBXKLAVIER_CFLAGS
+- LIBXKLAVIER_LIBS=$pkg_cv_LIBXKLAVIER_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- have_libxklavier=yes
+ for ac_dir in $ac_x_header_dirs; do
+ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+done
-+fi
+ fi
+-if test "x$have_libxklavier" = "xyes" ; then
+rm -f conftest.err conftest.$ac_ext
+fi # $ac_x_includes = no
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBXKLAVIER /**/
+if test "$ac_x_libraries" = no; then
+ # Check for the libraries.
+ # See if we find them without any special options.
@@ -46176,17 +46249,19 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+-
+-fi
+- if test x$have_libxklavier = xyes; then
+- HAVE_LIBXKLAVIER_TRUE=
+- HAVE_LIBXKLAVIER_FALSE='#'
+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
-- SIMPLE_GREETER_CFLAGS=$pkg_cv_SIMPLE_GREETER_CFLAGS
-- SIMPLE_GREETER_LIBS=$pkg_cv_SIMPLE_GREETER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
+- HAVE_LIBXKLAVIER_TRUE='#'
+- HAVE_LIBXKLAVIER_FALSE=
+ LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
@@ -46199,7 +46274,6 @@
+ done
+done
fi
--SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm"
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
@@ -46221,6 +46295,8 @@
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+-
+-
+if test "$have_x" != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
@@ -46239,17 +46315,23 @@
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBXKLAVIER" >&5
--$as_echo_n "checking for LIBXKLAVIER... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for SIMPLE_CHOOSER" >&5
+-$as_echo_n "checking for SIMPLE_CHOOSER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
+$as_echo_n "checking for XLIB... " >&6; }
--if test -n "$LIBXKLAVIER_CFLAGS"; then
-- pkg_cv_LIBXKLAVIER_CFLAGS="$LIBXKLAVIER_CFLAGS"
+-if test -n "$SIMPLE_CHOOSER_CFLAGS"; then
+- pkg_cv_SIMPLE_CHOOSER_CFLAGS="$SIMPLE_CHOOSER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxklavier >= \$LIBXKLAVIER_REQUIRED_VERSION\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION") 2>&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+- gconf-2.0 >= \$GCONF_REQUIRED_VERSION
+-\"") >&5
+- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XLIB_CFLAGS"; then
+ pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
@@ -46260,7 +46342,10 @@
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBXKLAVIER_CFLAGS=`$PKG_CONFIG --cflags "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>/dev/null`
+- pkg_cv_SIMPLE_CHOOSER_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null`
@@ -46273,150 +46358,6 @@
+else
+ pkg_failed=untried
fi
--if test -n "$LIBXKLAVIER_LIBS"; then
-- pkg_cv_LIBXKLAVIER_LIBS="$LIBXKLAVIER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxklavier >= \$LIBXKLAVIER_REQUIRED_VERSION\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$XLIB_LIBS"; then
-+ pkg_cv_XLIB_LIBS="$XLIB_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
-- pkg_cv_LIBXKLAVIER_LIBS=`$PKG_CONFIG --libs "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>/dev/null`
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -26758,357 +17364,516 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBXKLAVIER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>&1`
-+ XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xau"`
- else
-- LIBXKLAVIER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION" 2>&1`
-+ XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xau"`
- fi
- # Put the nasty error message in config.log where it belongs
-- echo "$LIBXKLAVIER_PKG_ERRORS" >&5
-+ echo "$XLIB_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_libxklavier=no
--elif test $pkg_failed = untried; then
-- have_libxklavier=no
--else
-- LIBXKLAVIER_CFLAGS=$pkg_cv_LIBXKLAVIER_CFLAGS
-- LIBXKLAVIER_LIBS=$pkg_cv_LIBXKLAVIER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- have_libxklavier=yes
--fi
--if test "x$have_libxklavier" = "xyes" ; then
-+ 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 HAVE_LIBXKLAVIER /**/
--_ACEOF
-+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
--fi
-- if test x$have_libxklavier = xyes; then
-- HAVE_LIBXKLAVIER_TRUE=
-- HAVE_LIBXKLAVIER_FALSE='#'
-+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
- else
-- HAVE_LIBXKLAVIER_TRUE='#'
-- HAVE_LIBXKLAVIER_FALSE=
--fi
--
--
-+ if test -n "$x_includes"; then
-+ X_CFLAGS="$X_CFLAGS -I$x_includes"
-+ fi
-
-+ # It would also be nice to do this for all -L options, not just this one.
-+ if test -n "$x_libraries"; then
-+ 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:${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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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
-+ LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for SIMPLE_CHOOSER" >&5
--$as_echo_n "checking for SIMPLE_CHOOSER... " >&6; }
-+int
-+main ()
-+{
-
--if test -n "$SIMPLE_CHOOSER_CFLAGS"; then
-- pkg_cv_SIMPLE_CHOOSER_CFLAGS="$SIMPLE_CHOOSER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-- gconf-2.0 >= \$GCONF_REQUIRED_VERSION
--\"") >&5
-- ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_SIMPLE_CHOOSER_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
-if test -n "$SIMPLE_CHOOSER_LIBS"; then
- pkg_cv_SIMPLE_CHOOSER_LIBS="$SIMPLE_CHOOSER_LIBS"
- elif test -n "$PKG_CONFIG"; then
@@ -46436,6 +46377,127 @@
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- gconf-2.0 >= $GCONF_REQUIRED_VERSION
-" 2>/dev/null`
++if test -n "$PKG_CONFIG"; then
++ if test -n "$XLIB_LIBS"; then
++ pkg_cv_XLIB_LIBS="$XLIB_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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -26862,253 +17392,516 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-" 2>&1`
++ XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xau"`
+ else
+- SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-" 2>&1`
++ XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xau"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$SIMPLE_CHOOSER_PKG_ERRORS" >&5
++ echo "$XLIB_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-) were not met:
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ if test "$no_x" = yes; then
++ # Not all programs may use this symbol, but it does not hurt to define it.
+
+-$SIMPLE_CHOOSER_PKG_ERRORS
++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
++else
++ if test -n "$x_includes"; then
++ X_CFLAGS="$X_CFLAGS -I$x_includes"
++ fi
+
+-Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS
+-and SIMPLE_CHOOSER_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 (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+- gtk+-2.0 >= $GTK_REQUIRED_VERSION
+- gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-) were not met:
++ # It would also be nice to do this for all -L options, not just this one.
++ if test -n "$x_libraries"; then
++ 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:${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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-$SIMPLE_CHOOSER_PKG_ERRORS
++int
++main ()
++{
+
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++ ;
++ return 0;
++}
++_ACEOF
++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
++ LIBS="$ac_xsave_LIBS -R $x_libraries"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS
+-and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$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.
++int
++main ()
++{
+
+-Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS
+-and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+ ;
+ return 0;
+}
@@ -46444,26 +46506,31 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
- else
-- pkg_failed=yes
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
- fi
-- else
-- pkg_failed=untried
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- fi
++fi
+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
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-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
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+-Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS
+-and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
@@ -46473,8 +46540,7 @@
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--if test $pkg_failed = yes; then
++
+/* 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. */
@@ -46492,64 +46558,15 @@
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--" 2>&1`
-- else
-- SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$SIMPLE_CHOOSER_PKG_ERRORS" >&5
--
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--) were not met:
--
--$SIMPLE_CHOOSER_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 SIMPLE_CHOOSER_CFLAGS
--and SIMPLE_CHOOSER_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 (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- gconf-2.0 >= $GCONF_REQUIRED_VERSION
--) were not met:
--
--$SIMPLE_CHOOSER_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 SIMPLE_CHOOSER_CFLAGS
--and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$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 SIMPLE_CHOOSER_CFLAGS
--and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+- SIMPLE_CHOOSER_CFLAGS=$pkg_cv_SIMPLE_CHOOSER_CFLAGS
+- SIMPLE_CHOOSER_LIBS=$pkg_cv_SIMPLE_CHOOSER_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+ { $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 :
@@ -46559,12 +46576,7 @@
+LIBS="-ldnet $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
++
+/* 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. */
@@ -46593,11 +46605,8 @@
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+fi
-
--Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS
--and SIMPLE_CHOOSER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $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; }
@@ -46609,9 +46618,6 @@
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+/* 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. */
@@ -46629,12 +46635,7 @@
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-- SIMPLE_CHOOSER_CFLAGS=$pkg_cv_SIMPLE_CHOOSER_CFLAGS
-- SIMPLE_CHOOSER_LIBS=$pkg_cv_SIMPLE_CHOOSER_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
++else
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
@@ -46645,7 +46646,7 @@
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
++fi
+ fi
+fi
@@ -46653,6 +46654,9 @@
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+-pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for APPLET" >&5
+-$as_echo_n "checking for APPLET... " >&6; }
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
@@ -46663,22 +46667,6 @@
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
-+fi
-
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for APPLET" >&5
--$as_echo_n "checking for APPLET... " >&6; }
-+ if test $ac_cv_func_gethostbyname = no; then
-+ { $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 :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-if test -n "$APPLET_CFLAGS"; then
- pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
@@ -46693,6 +46681,20 @@
- (exit $ac_status); }; then
- pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION" 2>/dev/null`
++fi
++
++ if test $ac_cv_func_gethostbyname = no; then
++ { $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 :
++ $as_echo_n "(cached) " >&6
+ else
+- pkg_failed=yes
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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. */
@@ -46710,8 +46712,7 @@
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
- else
-- pkg_failed=yes
++else
+ ac_cv_lib_nsl_gethostbyname=no
fi
- else
@@ -46744,8 +46745,7 @@
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- pkg_failed=yes
++else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -46768,15 +46768,16 @@
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
-+else
+ else
+- pkg_failed=yes
+ ac_cv_lib_bsd_gethostbyname=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
fi
- else
- pkg_failed=untried
-+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_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
@@ -47106,7 +47107,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -27121,16 +17886,12 @@
+@@ -27121,16 +17914,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 . . . .
@@ -47125,7 +47126,7 @@
/* end confdefs.h. */
int
-@@ -27141,40 +17902,13 @@
+@@ -27141,40 +17930,13 @@
return 0;
}
_ACEOF
@@ -47170,7 +47171,7 @@
/* end confdefs.h. */
int
-@@ -27185,46 +17919,19 @@
+@@ -27185,46 +17947,19 @@
return 0;
}
_ACEOF
@@ -47224,7 +47225,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -27240,11 +17947,7 @@
+@@ -27240,11 +17975,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"
@@ -47237,7 +47238,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27262,44 +17965,17 @@
+@@ -27262,44 +17993,17 @@
return 0;
}
_ACEOF
@@ -47287,7 +47288,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27317,59 +17993,30 @@
+@@ -27317,59 +18021,30 @@
return 0;
}
_ACEOF
@@ -47356,7 +47357,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27387,161 +18034,49 @@
+@@ -27387,52 +18062,25 @@
return 0;
}
_ACEOF
@@ -47381,41 +47382,46 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dnet_stub_dnet_ntoa=yes
--else
++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
--fi
++ 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
--LIBS=$ac_check_lib_save_LIBS
--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:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
++{ $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
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
--fi
--
-- fi
--fi
++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
-- LIBS="$ac_xsave_LIBS"
--
-- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-- # to get the SysV transport functions.
-- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-- # needs -lnsl.
-- # The nsl library prevents programs from opening the X display
-- # 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.
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+@@ -27443,105 +18091,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
@@ -47435,7 +47441,9 @@
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -47488,41 +47496,13 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_gethostbyname=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_dnet_stub_dnet_ntoa=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_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 :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+fi
-
+-
- ac_cv_func_gethostbyname=no
-+ fi
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS="$ac_xsave_LIBS"
-+
-+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-+ # to get the SysV transport functions.
-+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-+ # needs -lnsl.
-+ # The nsl library prevents programs from opening the X display
-+ # 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.
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47549,7 +47529,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27559,59 +18094,30 @@
+@@ -27559,59 +18122,30 @@
return 0;
}
_ACEOF
@@ -47618,7 +47598,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27629,43 +18135,18 @@
+@@ -27629,242 +18163,46 @@
return 0;
}
_ACEOF
@@ -47668,10 +47648,16 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -27679,105 +18160,20 @@
- # 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.
+- fi
+- fi
+-
+- # lieder at skyler.mavd.honeywell.com says without -lsocket,
+- # socket/setsockopt and other routines are undefined under SCO ODT
+- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+- # on later versions), says Simon Leinen: it contains gethostby*
+- # 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
@@ -47747,12 +47733,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
+-
- ac_cv_func_connect=no
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47760,105 +47744,20 @@
-{ $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
+- if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
- $as_echo_n "checking for connect in -lsocket... " >&6; }
+-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-+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"
+- $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
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -27795,148 +18191,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_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 <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -47866,18 +47765,11 @@
-#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
--
+-char connect ();
-int
-main ()
-{
--return remove ();
+-return connect ();
- ;
- return 0;
-}
@@ -47903,13 +47795,144 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_remove=yes
+- 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
+-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_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
+-
++ 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
++ # lieder at skyler.mavd.honeywell.com says without -lsocket,
++ # socket/setsockopt and other routines are undefined under SCO ODT
++ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
++ # on later versions), says Simon Leinen: it contains gethostby*
++ # 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.
++ 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 remove to an innocuous variant, in case <limits.h> declares remove.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char remove (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef remove
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -27872,71 +18210,47 @@
+ #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
+-
++char connect ();
+ int
+ main ()
+ {
+-return remove ();
++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
+- ac_cv_func_remove=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_remove=no
--fi
++ 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
++
++ 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 :
@@ -47939,7 +47962,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27954,148 +18240,38 @@
+@@ -27954,76 +18268,39 @@
return 0;
}
_ACEOF
@@ -47966,38 +47989,55 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_posix_remove=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
--fi
++ 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
++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 "$ac_cv_lib_posix_remove" >&6; }
++{ $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
--
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++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
++ 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
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lipc $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shmat innocuous_shmat
@@ -48014,25 +48054,376 @@
-#endif
-
-#undef shmat
--
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -28032,13 +18309,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 ()
+ {
+@@ -28047,55 +18317,41 @@
+ 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
++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_func_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:${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 :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ 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
++ fi
++ fi
++
++ # Check for libraries that X11R6 Xt/Xaw programs need.
++ ac_save_LDFLAGS=$LDFLAGS
++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
++ # check for ICE first), but we must link in the order -lSM -lICE or
++ # we get undefined symbols. So assume we have SM if we have ICE.
++ # 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:${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 :
+ $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
++LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -28104,178 +18360,300 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shmat ();
++char IceConnectionNumber ();
+ int
+ main ()
+ {
+-return shmat ();
++return IceConnectionNumber ();
+ ;
+ 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
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ICE_IceConnectionNumber=yes
++else
++ ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5
++$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
++ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++fi
++
++ LDFLAGS=$ac_save_LDFLAGS
++
++fi
++
++ if test "x$no_x" = xyes; then
++ as_fn_error "\"no (requires X development libraries)\"" "$LINENO" 5
++ else
++ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS"
++ XLIB_CFLAGS=$X_CFLAGS
++ fi
++else
++ XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
++ XLIB_LIBS=$pkg_cv_XLIB_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
++
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
++$as_echo_n "checking for GTK... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GTK_CFLAGS"; then
++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GTK_LIBS"; then
++ pkg_cv_GTK_LIBS="$GTK_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++"`
++ else
++ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTK_PKG_ERRORS" >&5
++
++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
++) were not met:
++
++$GTK_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 GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++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.
++
++Alternatively, you may set the environment variables GTK_CFLAGS
++and GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
++ GTK_LIBS=$pkg_cv_GTK_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
++
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANBERRA_GTK" >&5
++$as_echo_n "checking for CANBERRA_GTK... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CANBERRA_GTK_CFLAGS"; then
++ pkg_cv_CANBERRA_GTK_CFLAGS="$CANBERRA_GTK_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++") 2>&5
+ 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_ipc_shmat=yes
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++" 2>/dev/null`
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ipc_shmat=no
++ pkg_failed=yes
+ 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
++else
++ pkg_failed=untried
+ fi
+-{ $as_echo "$as_me:$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
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
++if test -n "$PKG_CONFIG"; then
++ if test -n "$CANBERRA_GTK_LIBS"; then
++ pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-
+ fi
+- fi
+-
+- # Check for libraries that X11R6 Xt/Xaw programs need.
+- ac_save_LDFLAGS=$LDFLAGS
+- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+- # check for ICE first), but we must link in the order -lSM -lICE or
+- # we get undefined symbols. So assume we have SM if we have ICE.
+- # 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_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-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
+-/* end confdefs.h. */
++ pkg_failed=untried
++fi
+
-/* 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
--
+-char IceConnectionNumber ();
-int
-main ()
-{
--return shmat ();
+-return IceConnectionNumber ();
- ;
- return 0;
-}
@@ -48058,206 +48449,83 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_shmat=yes
+- ac_cv_lib_ICE_IceConnectionNumber=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shmat=no
-+else
-+ ac_cv_lib_posix_remove=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_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
+
+- 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
-+ fi
-+
-+ # 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 :
-+
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$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
+- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
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.
-@@ -28113,43 +18289,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
-
-@@ -28165,18 +18316,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.
-@@ -28194,43 +18341,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
-
-@@ -28238,44 +18360,68 @@
-
- fi
-
-+ if test "x$no_x" = xyes; then
-+ as_fn_error "\"no (requires X development libraries)\"" "$LINENO" 5
-+ else
-+ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS"
-+ XLIB_CFLAGS=$X_CFLAGS
-+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++"`
++ else
++ CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$CANBERRA_GTK_PKG_ERRORS" >&5
+
+- LDFLAGS=$ac_save_LDFLAGS
++ as_fn_error "Package requirements (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
++) were not met:
++
++$CANBERRA_GTK_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 CANBERRA_GTK_CFLAGS
++and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++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.
++
++Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
++and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." "$LINENO" 5; }
+else
-+ XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
-+ XLIB_LIBS=$pkg_cv_XLIB_LIBS
++ CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS
++ CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
-+fi
-+
-+
+ fi
+
-# Unit testing framework
++
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for CHECK" >&5
-$as_echo_n "checking for CHECK... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-+$as_echo_n "checking for GTK... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
++$as_echo_n "checking for GCONF... " >&6; }
-if test -n "$CHECK_CFLAGS"; then
- pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
@@ -48266,13 +48534,13 @@
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\"") >&5
- ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTK_CFLAGS"; then
-+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
++ if test -n "$GCONF_CFLAGS"; then
++ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -48280,7 +48548,7 @@
- pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.4" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+" 2>/dev/null`
else
pkg_failed=yes
@@ -48298,13 +48566,13 @@
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\"") >&5
- ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTK_LIBS"; then
-+ pkg_cv_GTK_LIBS="$GTK_LIBS"
++ if test -n "$GCONF_LIBS"; then
++ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -48312,7 +48580,7 @@
- pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.4" 2>/dev/null`
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+" 2>/dev/null`
else
pkg_failed=yes
@@ -48325,35 +48593,35 @@
fi
-@@ -28288,887 +18434,1077 @@
+@@ -28288,887 +18666,993 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.4" 2>&1`
-+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+"`
else
- CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.4" 2>&1`
-+ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
+"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$CHECK_PKG_ERRORS" >&5
-+ echo "$GTK_PKG_ERRORS" >&5
++ echo "$GCONF_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- have_check=no
-+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ as_fn_error "Package requirements (gconf-2.0 >= $GCONF_REQUIRED_VERSION
+) were not met:
+
-+$GTK_PKG_ERRORS
++$GCONF_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 GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
elif test $pkg_failed = untried; then
@@ -48364,8 +48632,8 @@
+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 GTK_CFLAGS
-+and GTK_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -48374,67 +48642,19 @@
- CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
- CHECK_LIBS=$pkg_cv_CHECK_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-+ GTK_LIBS=$pkg_cv_GTK_LIBS
++ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
++ GCONF_LIBS=$pkg_cv_GCONF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_check=yes
-+ :
- fi
+-fi
- if test "x$CHECK_CFLAGS" != "x"; then
- HAVE_CHECK_TRUE=
- HAVE_CHECK_FALSE='#'
-+
-+
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANBERRA_GTK" >&5
-+$as_echo_n "checking for CANBERRA_GTK... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$CANBERRA_GTK_CFLAGS"; then
-+ pkg_cv_CANBERRA_GTK_CFLAGS="$CANBERRA_GTK_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+" 2>/dev/null`
- else
+-else
- HAVE_CHECK_TRUE='#'
- HAVE_CHECK_FALSE=
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$CANBERRA_GTK_LIBS"; then
-+ pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
++ :
fi
@@ -48467,201 +48687,11 @@
- ;;
-esac
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
--GCONFTOOL=$ac_cv_path_GCONFTOOL
--if test -n "$GCONFTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--$as_echo "$GCONFTOOL" >&6; }
-+ if test $_pkg_short_errors_supported = yes; then
-+ CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+"`
-+ else
-+ CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$CANBERRA_GTK_PKG_ERRORS" >&5
-+
-+ as_fn_error "Package requirements (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
-+) were not met:
-+
-+$CANBERRA_GTK_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 CANBERRA_GTK_CFLAGS
-+and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+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.
-+
-+Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
-+and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS
-+ CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
- fi
-
-
-
-
-- 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
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
-+$as_echo_n "checking for GCONF... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GCONF_CFLAGS"; then
-+ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GCONF_LIBS"; then
-+ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION
-+\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
-
--# Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then
-- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+"`
-+ else
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GCONF_PKG_ERRORS" >&5
-
-+ as_fn_error "Package requirements (gconf-2.0 >= $GCONF_REQUIRED_VERSION
-+) were not met:
-
-+$GCONF_PKG_ERRORS
-
-- { $as_echo "$as_me:$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; }
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+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.
-
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
--# Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then
-- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-+ GCONF_LIBS=$pkg_cv_GCONF_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
- fi
-
-
-
-- { $as_echo "$as_me:$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
-- 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; }; } ;;
-- esac
--fi
++
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT_POWER" >&5
+$as_echo_n "checking for DEVKIT_POWER... " >&6; }
-
-- if test "$enable_schemas_install" != no; then
-- GCONF_SCHEMAS_INSTALL_TRUE=
-- GCONF_SCHEMAS_INSTALL_FALSE='#'
++
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DEVKIT_POWER_CFLAGS"; then
+ pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
@@ -48673,13 +48703,17 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-GCONFTOOL=$ac_cv_path_GCONFTOOL
+-if test -n "$GCONFTOOL"; then
+- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
+-$as_echo "$GCONFTOOL" >&6; }
++ fi
else
-- GCONF_SCHEMAS_INSTALL_TRUE='#'
-- GCONF_SCHEMAS_INSTALL_FALSE=
-+ pkg_failed=yes
-+fi
-+ fi
-+else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
@@ -48705,6 +48739,141 @@
+if test $pkg_failed = yes; then
+- 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
+-
+-
+-# Check whether --with-gconf-source was given.
+-if test "${with_gconf_source+set}" = set; then
+- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION"`
++ else
++ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$DEVKIT_POWER_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ have_devicekit_power=no
+
++elif test $pkg_failed = untried; then
++ have_devicekit_power=no
+
++else
++ DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
++ DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_devicekit_power=yes
++fi
++if test "x$have_devicekit_power" = "xyes" ; then
+
+- { $as_echo "$as_me:$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; }
++$as_echo "#define HAVE_DEVICEKIT_POWER /**/" >>confdefs.h
+
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
++fi
+
+
+-# Check whether --with-gconf-schema-file-dir was given.
+-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 "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDMSETUP" >&5
++$as_echo_n "checking for GDMSETUP... " >&6; }
+
+- # Check whether --enable-schemas-install was given.
+-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; }; } ;;
+- esac
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GDMSETUP_CFLAGS"; then
++ pkg_cv_GDMSETUP_CFLAGS="$GDMSETUP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gtk-1 >= \$POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++ gmodule-2.0
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GDMSETUP_CFLAGS=`$PKG_CONFIG --cflags "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++" 2>/dev/null`
++else
++ pkg_failed=yes
+ fi
+-
+- if test "$enable_schemas_install" != no; then
+- GCONF_SCHEMAS_INSTALL_TRUE=
+- GCONF_SCHEMAS_INSTALL_FALSE='#'
++ fi
+ else
+- GCONF_SCHEMAS_INSTALL_TRUE='#'
+- GCONF_SCHEMAS_INSTALL_FALSE=
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GDMSETUP_LIBS"; then
++ pkg_cv_GDMSETUP_LIBS="$GDMSETUP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gtk-1 >= \$POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++ gmodule-2.0
++\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GDMSETUP_LIBS=`$PKG_CONFIG --libs "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+
++if test $pkg_failed = yes; then
+
-
-# Check whether --with-sysconfsubdir was given.
-if test "${with_sysconfsubdir+set}" = set; then
@@ -48716,40 +48885,61 @@
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
-+ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION"`
++ GDMSETUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++"`
+ else
-+ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION"`
++ GDMSETUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++"`
+ fi
+ # Put the nasty error message in config.log where it belongs
-+ echo "$DEVKIT_POWER_PKG_ERRORS" >&5
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ have_devicekit_power=no
-
-+elif test $pkg_failed = untried; then
-+ have_devicekit_power=no
++ echo "$GDMSETUP_PKG_ERRORS" >&5
+
++ as_fn_error "Package requirements (polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
++ gtk+-2.0 >= $GTK_REQUIRED_VERSION
++ gmodule-2.0
++) were not met:
+
++$GDMSETUP_PKG_ERRORS
-if test x"${sysconfsubdir}" != xno -a x"${sysconfsubdir}" != x; then
- gdmconfdir='${sysconfdir}/${sysconfsubdir}'
- else
+-else
- gdmconfdir='${sysconfdir}'
-+ DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
-+ DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ have_devicekit_power=yes
- fi
-+if test "x$have_devicekit_power" = "xyes" ; then
-
-+$as_echo "#define HAVE_DEVICEKIT_POWER /**/" >>confdefs.h
-
--
+-fi
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
++Alternatively, you may set the environment variables GDMSETUP_CFLAGS
++and GDMSETUP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++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.
+
++Alternatively, you may set the environment variables GDMSETUP_CFLAGS
++and GDMSETUP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
-# Check whether --with-dmconfdir was given.
-if test "${with_dmconfdir+set}" = set; then
- withval=$with_dmconfdir; dmconfdir=${withval}
--else
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." "$LINENO" 5; }
+ else
- dmconfdir=${sysconfdir}/dm
++ GDMSETUP_CFLAGS=$pkg_cv_GDMSETUP_CFLAGS
++ GDMSETUP_LIBS=$pkg_cv_GDMSETUP_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
fi
@@ -48758,17 +48948,10 @@
-# Check whether --enable-console-helper was given.
-if test "${enable_console_helper+set}" = set; then
- enableval=$enable_console_helper;
--else
-- enable_console_helper=auto
--fi
-
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIMPLE_GREETER" >&5
+$as_echo_n "checking for SIMPLE_GREETER... " >&6; }
-
--# Check whether --enable-authentication-scheme was given.
--if test "${enable_authentication_scheme+set}" = set; then
-- enableval=$enable_authentication_scheme;
++
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SIMPLE_GREETER_CFLAGS"; then
+ pkg_cv_SIMPLE_GREETER_CFLAGS="$SIMPLE_GREETER_CFLAGS"
@@ -48796,11 +48979,17 @@
+ x11
+" 2>/dev/null`
else
+- enable_console_helper=auto
++ pkg_failed=yes
+ fi
+-
+-
+-# Check whether --enable-authentication-scheme was given.
+-if test "${enable_authentication_scheme+set}" = set; then
+- enableval=$enable_authentication_scheme;
++ fi
+ else
- enable_authentication_scheme=auto
-+ pkg_failed=yes
-+fi
-+ fi
-+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
@@ -50096,7 +50285,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29176,252 +19512,153 @@
+@@ -29176,252 +19660,153 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -50461,7 +50650,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29429,107 +19666,51 @@
+@@ -29429,107 +19814,51 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -50598,7 +50787,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29537,457 +19718,476 @@
+@@ -29537,457 +19866,476 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -51453,7 +51642,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29995,78 +20195,53 @@
+@@ -29995,78 +20343,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -51560,7 +51749,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30075,167 +20250,109 @@
+@@ -30075,167 +20398,109 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -51795,7 +51984,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30244,88 +20361,53 @@
+@@ -30244,88 +20509,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -51911,7 +52100,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30333,62 +20415,40 @@
+@@ -30333,62 +20563,40 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -51995,7 +52184,7 @@
else
mkdtemp_missing=true
-@@ -30404,10 +20464,10 @@
+@@ -30404,10 +20612,10 @@
@@ -52008,7 +52197,7 @@
enableval=$enable_ipv6;
else
enable_ipv6=no
-@@ -30415,11 +20475,7 @@
+@@ -30415,11 +20623,7 @@
if test x$enable_ipv6 = xyes; then
@@ -52021,7 +52210,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -30435,141 +20491,32 @@
+@@ -30435,141 +20639,32 @@
return 0;
}
_ACEOF
@@ -52170,7 +52359,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30587,157 +20534,42 @@
+@@ -30587,157 +20682,42 @@
return 0;
}
_ACEOF
@@ -52341,7 +52530,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30755,47 +20587,20 @@
+@@ -30755,47 +20735,20 @@
return 0;
}
_ACEOF
@@ -52397,7 +52586,7 @@
"LIBS=$LIBS -l$lib";have_inet_ntop=yes;break
fi
-@@ -30806,21 +20611,19 @@
+@@ -30806,21 +20759,19 @@
if test x$have_inet_ntop = xyes; then
have_ipv6=yes
@@ -52423,7 +52612,7 @@
$as_echo "no" >&6; }
fi
-@@ -30828,7 +20631,7 @@
+@@ -30828,7 +20779,7 @@
withval=""
# Check whether --with-user was given.
@@ -52432,7 +52621,7 @@
withval=$with_user;
fi
-@@ -30849,7 +20652,7 @@
+@@ -30849,7 +20800,7 @@
withval=""
# Check whether --with-group was given.
@@ -52441,7 +52630,7 @@
withval=$with_group;
fi
-@@ -30871,9 +20674,9 @@
+@@ -30871,9 +20822,9 @@
withval=""
# Check whether --with-pam-prefix was given.
@@ -52453,7 +52642,7 @@
$as_echo "\"PAM files will be installed in prefix ${withval}.\"" >&6; }
fi
fi
-@@ -30886,19 +20689,37 @@
+@@ -30886,19 +20837,37 @@
fi
@@ -52498,7 +52687,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30906,53 +20727,28 @@
+@@ -30906,53 +20875,28 @@
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
@@ -52568,7 +52757,7 @@
have_pam=yes
fi
-@@ -30960,157 +20756,17 @@
+@@ -30960,157 +20904,17 @@
if test "x$have_pam" = "xyes"; then
PAM_LIBS="${PAM_LIBS} -lpam"
else
@@ -52732,7 +52921,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -31119,18 +20775,14 @@
+@@ -31119,18 +20923,14 @@
done
@@ -52754,7 +52943,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31148,624 +20800,141 @@
+@@ -31148,93 +20948,56 @@
return 0;
}
_ACEOF
@@ -52852,43 +53041,39 @@
-cat >>confdefs.h <<\_ACEOF
-#define PAM_MESSAGE_NONCONST 1
-_ACEOF
--
+$as_echo "#define PAM_MESSAGE_NONCONST 1" >>confdefs.h
--fi
--rm -f conftest*
--
--else
-- { $as_echo "$as_me:$LINENO: result: \"not found - assume const, Linux-type PAM\"" >&5
--$as_echo "\"not found - assume const, Linux-type PAM\"" >&6; }
fi
rm -f conftest*
--fi
--
+ else
+- { $as_echo "$as_me:$LINENO: result: \"not found - assume const, Linux-type PAM\"" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found - assume const, Linux-type PAM\"" >&5
+ $as_echo "\"not found - assume const, Linux-type PAM\"" >&6; }
+
+ fi
+@@ -31242,14 +21005,10 @@
+
+ fi
+
-cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- #ifdef HAVE_USERSEC_H
-- #include <usersec.h>
-- #endif
--
--int
--main ()
--{
--
-- return (setpenv(NULL, (PENV_INIT | PENV_NOEXEC), NULL, NULL));
--
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++
+ #ifdef HAVE_USERSEC_H
+ #include <usersec.h>
+ #endif
+@@ -31264,1106 +21023,874 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -52910,35 +53095,47 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- can_use_setpenv=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ can_use_setpenv=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- can_use_setpenv=no
--fi
++ can_use_setpenv=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--
--if test x$can_use_setpenv = xyes ; then
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ if test x$can_use_setpenv = xyes ; then
+
-cat >>confdefs.h <<\_ACEOF
-#define CAN_USE_SETPENV /**/
-_ACEOF
--
--fi
--
--#
--# Can we use BSD's setusercontext
--#
++$as_echo "#define CAN_USE_SETPENV /**/" >>confdefs.h
+
+ fi
+
+ #
+ # Can we use BSD's setusercontext
+ #
-if test "${ac_cv_header_login_cap_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for login_cap.h" >&5
-$as_echo_n "checking for login_cap.h... " >&6; }
-if test "${ac_cv_header_login_cap_h+set}" = set; then
- $as_echo_n "(cached) " >&6
--fi
++ac_fn_c_check_header_mongrel "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" "$ac_includes_default"
++if test "x$ac_cv_header_login_cap_h" = x""yes; then :
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++
++$as_echo "#define HAVE_LOGINCAP 1" >>confdefs.h
++
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_login_cap_h" >&5
-$as_echo "$ac_cv_header_login_cap_h" >&6; }
-else
@@ -52953,7 +53150,19 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <login_cap.h>
--_ACEOF
++
++
++
++#
++# Check for sys/sockio.h
++#
++for ac_header in sys/sockio.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sockio_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_SOCKIO_H 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -52976,25 +53185,93 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
--fi
--
++
++$as_echo "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h
++
+ 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 login_cap.h presence" >&5
-$as_echo_n "checking login_cap.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++#
++# Check for libgen.h
++#
++for ac_header in libgen.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default"
++if test "x$ac_cv_header_libgen_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBGEN_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++$as_echo "#define HAVE_LIBGEN_H 1" >>confdefs.h
++
++fi
++
++done
++
++
++
++
++# Checking for a posix version of getpwnam_r
++# if we are cross compiling and can not run the test
++# assume getpwnam_r is the posix version
++# it is up to the person cross compiling to change
++# this behavior if desired
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix getpwnam_r" >&5
++$as_echo_n "checking for posix getpwnam_r... " >&6; }
++if test "${ac_cv_func_posix_getpwnam_r+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "$cross_compiling" = yes; then :
++ ac_cv_func_posix_getpwnam_r=yes
++
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <login_cap.h>
--_ACEOF
++
++#define _POSIX_PTHREAD_SEMANTICS
++#include <errno.h>
++#include <pwd.h>
++
++int
++main ()
++{
++
++ char buffer[10000];
++ struct passwd pwd, *pwptr = &pwd;
++ int error;
++ errno = 0;
++ error = getpwnam_r ("", &pwd, buffer,
++ sizeof (buffer), &pwptr);
++ return (error < 0 && errno == ENOSYS)
++ || error == ENOSYS;
++
++ ;
++ return 0;
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -53013,17 +53290,31 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_posix_getpwnam_r=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_func_posix_getpwnam_r=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
- ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_posix_getpwnam_r" >&5
++$as_echo "$ac_cv_func_posix_getpwnam_r" >&6; }
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
-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: )
@@ -53057,31 +53348,1581 @@
-{ $as_echo "$as_me:$LINENO: checking for login_cap.h" >&5
-$as_echo_n "checking for login_cap.h... " >&6; }
-if test "${ac_cv_header_login_cap_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "$ac_cv_func_posix_getpwnam_r" = yes; then
++
++$as_echo "#define HAVE_POSIX_GETPWNAM_R 1" >>confdefs.h
++
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nonposix getpwnam_r" >&5
++$as_echo_n "checking for nonposix getpwnam_r... " >&6; }
++if test "${ac_cv_func_nonposix_getpwnam_r+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_header_login_cap_h=$ac_header_preproc
--fi
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <pwd.h>
++int
++main ()
++{
++char buffer[10000];
++ struct passwd pwd;
++ getpwnam_r ("", &pwd, buffer,
++ sizeof (buffer));
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_func_nonposix_getpwnam_r=yes
++else
++ ac_cv_func_nonposix_getpwnam_r=no
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_login_cap_h" >&5
-$as_echo "$ac_cv_header_login_cap_h" >&6; }
--
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_nonposix_getpwnam_r" >&5
++$as_echo "$ac_cv_func_nonposix_getpwnam_r" >&6; }
++ if test "$ac_cv_func_nonposix_getpwnam_r" = yes; then
++
++$as_echo "#define HAVE_NONPOSIX_GETPWNAM_R 1" >>confdefs.h
+
++ fi
+ fi
-if test "x$ac_cv_header_login_cap_h" = x""yes; then
--
+
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
--
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOGINCAP 1
--_ACEOF
--
--fi
--
--
--
++
++for ac_header in utmp.h utmpx.h libutil.h sys/param.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$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
+
+ fi
+
++done
+
++for ac_func in getutxent updwtmpx updwtmp
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
-#
-# Check for sys/sockio.h
-#
--
++fi
++done
+
-for ac_header in sys/sockio.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 "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5
++$as_echo_n "checking for login in -lutil... " >&6; }
++if test "${ac_cv_lib_util_login+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
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
++
++/* 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 login ();
++int
++main ()
++{
++return login ();
++ ;
++ 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
+- ac_header_compiler=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_util_login=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
++ ac_cv_lib_util_login=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_util_login" >&5
++$as_echo "$ac_cv_lib_util_login" >&6; }
++if test "x$ac_cv_lib_util_login" = x""yes; then :
+
+-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
++$as_echo "#define HAVE_LOGIN 1" >>confdefs.h
+
+- ac_header_preproc=no
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ 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=gdm ##
+-## ------------------------------------------------------------------ ##
+-_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 "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5
++$as_echo_n "checking for logout in -lutil... " >&6; }
++if test "${ac_cv_lib_util_logout+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
+-
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_SOCKIO_H 1
++/* 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 logout ();
++int
++main ()
++{
++return logout ();
++ ;
++ return 0;
++}
+ _ACEOF
+-
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_util_logout=yes
++else
++ ac_cv_lib_util_logout=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_util_logout" >&5
++$as_echo "$ac_cv_lib_util_logout" >&6; }
++if test "x$ac_cv_lib_util_logout" = x""yes; then :
+
+-done
+
++$as_echo "#define HAVE_LOGOUT 1" >>confdefs.h
+
+-#
+-# Check for libgen.h
+-#
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++fi
+
+-for ac_header in libgen.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 "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5
++$as_echo_n "checking for logwtmp in -lutil... " >&6; }
++if test "${ac_cv_lib_util_logwtmp+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
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
++
++/* 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 logwtmp ();
++int
++main ()
++{
++return logwtmp ();
++ ;
++ 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
+- ac_header_compiler=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_util_logwtmp=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
++ ac_cv_lib_util_logwtmp=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_util_logwtmp" >&5
++$as_echo "$ac_cv_lib_util_logwtmp" >&6; }
++if test "x$ac_cv_lib_util_logwtmp" = x""yes; then :
+
+-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
++$as_echo "#define HAVE_LOGWTMP 1" >>confdefs.h
+
+- ac_header_preproc=no
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ 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=gdm ##
+-## ------------------------------------------------------------------ ##
+-_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 sys/time.h utmp.h utmpx.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$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
+
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBGEN_H 1
+-_ACEOF
+-
+ fi
+
+ done
+
+-
+-
+-
+-# Checking for a posix version of getpwnam_r
+-# if we are cross compiling and can not run the test
+-# assume getpwnam_r is the posix version
+-# it is up to the person cross compiling to change
+-# this behavior if desired
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-{ $as_echo "$as_me:$LINENO: checking for posix getpwnam_r" >&5
+-$as_echo_n "checking for posix getpwnam_r... " >&6; }
+-if test "${ac_cv_func_posix_getpwnam_r+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test "$cross_compiling" = yes; then
+- ac_cv_func_posix_getpwnam_r=yes
+-
+-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. */
+-
+-#define _POSIX_PTHREAD_SEMANTICS
+-#include <errno.h>
+-#include <pwd.h>
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
+
+ int
+ main ()
+ {
+-
+- char buffer[10000];
+- struct passwd pwd, *pwptr = &pwd;
+- int error;
+- errno = 0;
+- error = getpwnam_r ("", &pwd, buffer,
+- sizeof (buffer), &pwptr);
+- return (error < 0 && errno == ENOSYS)
+- || error == ENOSYS;
+-
++if ((struct tm *) 0)
++return 0;
+ ;
+ 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
+- ac_cv_func_posix_getpwnam_r=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_time=yes
+ 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
+-
+-( exit $ac_status )
+-ac_cv_func_posix_getpwnam_r=no
++ ac_cv_header_time=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 conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
+
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_posix_getpwnam_r" >&5
+-$as_echo "$ac_cv_func_posix_getpwnam_r" >&6; }
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-if test "$ac_cv_func_posix_getpwnam_r" = yes; then
++if test "$ac_cv_header_utmpx_h" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_POSIX_GETPWNAM_R 1
+-_ACEOF
++$as_echo "#define UTMP struct utmpx" >>confdefs.h
+
+ else
+- { $as_echo "$as_me:$LINENO: checking for nonposix getpwnam_r" >&5
+-$as_echo_n "checking for nonposix getpwnam_r... " >&6; }
+-if test "${ac_cv_func_nonposix_getpwnam_r+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
++
++$as_echo "#define UTMP struct utmp" >>confdefs.h
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host field in the utmp structure" >&5
++$as_echo_n "checking for ut_host field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <pwd.h>
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
+ int
+ main ()
+ {
+-char buffer[10000];
+- struct passwd pwd;
+- getpwnam_r ("", &pwd, buffer,
+- sizeof (buffer));
++UTMP ut; char *p; p=ut.ut_host;
+ ;
+ 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_nonposix_getpwnam_r=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_nonposix_getpwnam_r=no
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
++
++$as_echo "#define HAVE_UT_UT_HOST 1" >>confdefs.h
+
+-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_nonposix_getpwnam_r" >&5
+-$as_echo "$ac_cv_func_nonposix_getpwnam_r" >&6; }
+- if test "$ac_cv_func_nonposix_getpwnam_r" = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NONPOSIX_GETPWNAM_R 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid field in the utmp structure" >&5
++$as_echo_n "checking for ut_pid field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; int i; i=ut.ut_pid;
++ ;
++ return 0;
++}
+ _ACEOF
+-
+- fi
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
++else
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
++
++$as_echo "#define HAVE_UT_UT_PID 1" >>confdefs.h
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_id field in the utmp structure" >&5
++$as_echo_n "checking for ut_id field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; char *p; p=ut.ut_id;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
++else
++ result=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
+
++$as_echo "#define HAVE_UT_UT_ID 1" >>confdefs.h
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_name field in the utmp structure" >&5
++$as_echo_n "checking for ut_name field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; char *p; p=ut.ut_name;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
++else
++ result=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
+
++$as_echo "#define HAVE_UT_UT_NAME 1" >>confdefs.h
+
+-for ac_header in utmp.h utmpx.h libutil.h sys/param.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. */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_type field in the utmp structure" >&5
++$as_echo_n "checking for ut_type field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; int i; i=(int) ut.ut_type;
++ ;
++ return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
++else
++ result=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
++
++$as_echo "#define HAVE_UT_UT_TYPE 1" >>confdefs.h
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_exit.e_termination field in the utmp structure" >&5
++$as_echo_n "checking for ut_exit.e_termination field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; ut.ut_exit.e_termination=0;
++ ;
++ 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
+- ac_header_compiler=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
++ result=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; }
++if test "$result" = "yes"; then
+
+-# 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
++$as_echo "#define HAVE_UT_UT_EXIT_E_TERMINATION 1" >>confdefs.h
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_user field in the utmp structure" >&5
++$as_echo_n "checking for ut_user field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <$ac_header>
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; char *p; p=ut.ut_user;
++ ;
++ return 0;
++}
+ _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
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
+
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++$as_echo "#define HAVE_UT_UT_USER 1" >>confdefs.h
+
+-# 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=gdm ##
+-## ------------------------------------------------------------------ ##
+-_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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_time field in the utmp structure" >&5
++$as_echo_n "checking for ut_time field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#endif
++int
++main ()
++{
++UTMP ut; ut.ut_time=0;
++ ;
++ return 0;
++}
+ _ACEOF
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
++else
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
+
+-done
+-
+-
++$as_echo "#define HAVE_UT_UT_TIME 1" >>confdefs.h
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
+-for ac_func in getutxent updwtmpx updwtmp
+-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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in the utmp structure" >&5
++$as_echo_n "checking for ut_tv field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
+ #else
+-# include <assert.h>
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
+ #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
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
+ #endif
+-
+ int
+ main ()
+ {
+-return $ac_func ();
++UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval 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"
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "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
+-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
++$as_echo "#define HAVE_UT_UT_TV 1" >>confdefs.h
+
+ fi
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for login in -lutil" >&5
+-$as_echo_n "checking for login in -lutil... " >&6; }
+-if test "${ac_cv_lib_util_login+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_syslen field in the utmp structure" >&5
++$as_echo_n "checking for ut_syslen field in the utmp structure... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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"
++#ifdef TIME_WITH_SYS_TIME
++#include <sys/time.h>
++#include <time.h>
++#else
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#else
++#include <time.h>
++#endif
++#endif
++#ifdef HAVE_UTMP_H
++#include <utmp.h>
++#endif
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
+ #endif
+-char login ();
+ int
+ main ()
+ {
+-return login ();
++UTMP ut; ut.ut_syslen=0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_util_login=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ result=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_util_login=no
++ result=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "$result" = "yes"; then
+
+-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_util_login" >&5
+-$as_echo "$ac_cv_lib_util_login" >&6; }
+-if test "x$ac_cv_lib_util_login" = x""yes; then
++$as_echo "#define HAVE_UT_UT_SYSLEN 1" >>confdefs.h
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
++$as_echo "$result" >&6; }
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LOGIN 1
+-_ACEOF
+
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+
+-{ $as_echo "$as_me:$LINENO: checking for logout in -lutil" >&5
+-$as_echo_n "checking for logout in -lutil... " >&6; }
+-if test "${ac_cv_lib_util_logout+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if utmpx structure has ut_syslen field" >&5
++$as_echo_n "checking if utmpx structure has ut_syslen field... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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 logout ();
++
++ #include <utmpx.h>
+ int
+ main ()
+ {
+-return logout ();
++
++ struct utmpx record;
++ record.ut_syslen = sizeof (record.ut_host);
++
+ ;
+ 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_util_logout=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ have_ut_syslen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ have_ut_syslen=no
+
+- ac_cv_lib_util_logout=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test x$have_ut_syslen = xyes; then
++
++$as_echo "#define HAVE_UT_SYSLEN 1" >>confdefs.h
+
+-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_util_logout" >&5
+-$as_echo "$ac_cv_lib_util_logout" >&6; }
+-if test "x$ac_cv_lib_util_logout" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ut_syslen" >&5
++$as_echo "$have_ut_syslen" >&6; }
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LOGOUT 1
+-_ACEOF
+
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
++XDMCP_LIBS=""
++if test x$with_xdmcp != xno ; then
++ xdmcp_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++ ac_fn_c_check_header_compile "$LINENO" "X11/Xdmcp.h" "ac_cv_header_X11_Xdmcp_h" "#include <X11/Xproto.h>
++"
++if test "x$ac_cv_header_X11_Xdmcp_h" = x""yes; then :
+
+-{ $as_echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
+-$as_echo_n "checking for logwtmp in -lutil... " >&6; }
+-if test "${ac_cv_lib_util_logwtmp+set}" = set; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpFlush in -lXdmcp" >&5
++$as_echo_n "checking for XdmcpFlush in -lXdmcp... " >&6; }
++if test "${ac_cv_lib_Xdmcp_XdmcpFlush+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lXdmcp $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -32372,1109 +21899,736 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char logwtmp ();
++char XdmcpFlush ();
+ int
+ main ()
+ {
+-return logwtmp ();
++return XdmcpFlush ();
+ ;
+ 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_util_logwtmp=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_Xdmcp_XdmcpFlush=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_util_logwtmp=no
++ ac_cv_lib_Xdmcp_XdmcpFlush=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_util_logwtmp" >&5
+-$as_echo "$ac_cv_lib_util_logwtmp" >&6; }
+-if test "x$ac_cv_lib_util_logwtmp" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpFlush" >&5
++$as_echo "$ac_cv_lib_Xdmcp_XdmcpFlush" >&6; }
++if test "x$ac_cv_lib_Xdmcp_XdmcpFlush" = x""yes; then :
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LOGWTMP 1
+-_ACEOF
++$as_echo "#define HAVE_LIBXDMCP 1" >>confdefs.h
+
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++ XDMCP_LIBS="-lXdmcp"
++ XDMCP_SUPPORT=yes
+ fi
+
+
+-
+-
+-
+-
+-for ac_header in sys/time.h utmp.h utmpx.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
@@ -53129,18 +54970,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found - assume const, Linux-type PAM\"" >&5
-+$as_echo "\"not found - assume const, Linux-type PAM\"" >&6; }
-
+-
- ac_header_compiler=no
fi
-+rm -f conftest*
-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; }
-+fi
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -53150,8 +54986,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -53177,14 +55012,15 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
--fi
++ if test x$with_xdmcp = xyes -a "x$XDMCP_SUPPORT" = "x" ; then
++ as_fn_error "XDMCP support requested but XDMCP libraries not found" "$LINENO" 5
++ fi
++ CPPFLAGS="$xdmcp_save_CPPFLAGS"
+ fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+ #ifdef HAVE_USERSEC_H
-+ #include <usersec.h>
-+ #endif
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -53220,758 +55056,18 @@
-$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
-+int
-+main ()
-+{
-+
-+ return (setpenv(NULL, (PENV_INIT | PENV_NOEXEC), NULL, NULL));
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ can_use_setpenv=yes
++if test "x$XDMCP_SUPPORT" = "xyes" ; then
++ if true; then
++ XDMCP_SUPPORT_TRUE=
++ XDMCP_SUPPORT_FALSE='#'
else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ can_use_setpenv=no
- 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; }
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+if test x$can_use_setpenv = xyes ; then
-+
-+$as_echo "#define CAN_USE_SETPENV /**/" >>confdefs.h
-
- 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
-
-+#
-+# Can we use BSD's setusercontext
-+#
-+ac_fn_c_check_header_mongrel "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" "$ac_includes_default"
-+if test "x$ac_cv_header_login_cap_h" = x""yes; then :
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYS_SOCKIO_H 1
--_ACEOF
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+
-+$as_echo "#define HAVE_LOGINCAP 1" >>confdefs.h
-
- fi
-
--done
-
-
- #
--# Check for libgen.h
-+# Check for sys/sockio.h
- #
--
--for ac_header in libgen.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>
-+for ac_header in sys/sockio.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sockio_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SOCKIO_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; }
-
--# 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
-+$as_echo "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h
-
-- 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; }
-+done
-
--# 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=gdm ##
--## ------------------------------------------------------------------ ##
--_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
-+#
-+# Check for libgen.h
-+#
-+for ac_header in libgen.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default"
-+if test "x$ac_cv_header_libgen_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LIBGEN_H 1
- _ACEOF
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBGEN_H 1
--_ACEOF
-+$as_echo "#define HAVE_LIBGEN_H 1" >>confdefs.h
-
- fi
-
-@@ -31786,20 +20955,16 @@
- 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 for posix getpwnam_r" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix getpwnam_r" >&5
- $as_echo_n "checking for posix getpwnam_r... " >&6; }
--if test "${ac_cv_func_posix_getpwnam_r+set}" = set; then
-+if test "${ac_cv_func_posix_getpwnam_r+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- if test "$cross_compiling" = yes; then
-+ if test "$cross_compiling" = yes; then :
- ac_cv_func_posix_getpwnam_r=yes
-
- 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. */
-
- #define _POSIX_PTHREAD_SEMANTICS
-@@ -31823,849 +20988,628 @@
- 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
-- ac_cv_func_posix_getpwnam_r=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_func_posix_getpwnam_r=yes
-+else
-+ ac_cv_func_posix_getpwnam_r=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_posix_getpwnam_r" >&5
-+$as_echo "$ac_cv_func_posix_getpwnam_r" >&6; }
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+if test "$ac_cv_func_posix_getpwnam_r" = yes; then
-+
-+$as_echo "#define HAVE_POSIX_GETPWNAM_R 1" >>confdefs.h
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nonposix getpwnam_r" >&5
-+$as_echo_n "checking for nonposix getpwnam_r... " >&6; }
-+if test "${ac_cv_func_nonposix_getpwnam_r+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <pwd.h>
-+int
-+main ()
-+{
-+char buffer[10000];
-+ struct passwd pwd;
-+ getpwnam_r ("", &pwd, buffer,
-+ sizeof (buffer));
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_func_nonposix_getpwnam_r=yes
-+else
-+ ac_cv_func_nonposix_getpwnam_r=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_nonposix_getpwnam_r" >&5
-+$as_echo "$ac_cv_func_nonposix_getpwnam_r" >&6; }
-+ if test "$ac_cv_func_nonposix_getpwnam_r" = yes; then
-+
-+$as_echo "#define HAVE_NONPOSIX_GETPWNAM_R 1" >>confdefs.h
-+
-+ fi
-+fi
-+
-+
-+
-+for ac_header in utmp.h utmpx.h libutil.h sys/param.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$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
-+
-+fi
-+
-+done
-+
-+for ac_func in getutxent updwtmpx updwtmp
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ 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
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5
-+$as_echo_n "checking for login in -lutil... " >&6; }
-+if test "${ac_cv_lib_util_login+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 login ();
-+int
-+main ()
-+{
-+return login ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_util_login=yes
-+else
-+ ac_cv_lib_util_login=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_util_login" >&5
-+$as_echo "$ac_cv_lib_util_login" >&6; }
-+if test "x$ac_cv_lib_util_login" = x""yes; then :
-+
-+
-+$as_echo "#define HAVE_LOGIN 1" >>confdefs.h
-+
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5
-+$as_echo_n "checking for logout in -lutil... " >&6; }
-+if test "${ac_cv_lib_util_logout+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 logout ();
-+int
-+main ()
-+{
-+return logout ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_util_logout=yes
- 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
--
--( exit $ac_status )
--ac_cv_func_posix_getpwnam_r=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
-+ ac_cv_lib_util_logout=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:$LINENO: result: $ac_cv_func_posix_getpwnam_r" >&5
--$as_echo "$ac_cv_func_posix_getpwnam_r" >&6; }
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logout" >&5
-+$as_echo "$ac_cv_lib_util_logout" >&6; }
-+if test "x$ac_cv_lib_util_logout" = x""yes; then :
-
-
--if test "$ac_cv_func_posix_getpwnam_r" = yes; then
-+$as_echo "#define HAVE_LOGOUT 1" >>confdefs.h
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_POSIX_GETPWNAM_R 1
--_ACEOF
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+fi
-
--else
-- { $as_echo "$as_me:$LINENO: checking for nonposix getpwnam_r" >&5
--$as_echo_n "checking for nonposix getpwnam_r... " >&6; }
--if test "${ac_cv_func_nonposix_getpwnam_r+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5
-+$as_echo_n "checking for logwtmp in -lutil... " >&6; }
-+if test "${ac_cv_lib_util_logwtmp+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="-lutil $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <pwd.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 logwtmp ();
- int
- main ()
- {
--char buffer[10000];
-- struct passwd pwd;
-- getpwnam_r ("", &pwd, buffer,
-- sizeof (buffer));
-+return logwtmp ();
- ;
- 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_nonposix_getpwnam_r=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_util_logwtmp=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_nonposix_getpwnam_r=no
-+ ac_cv_lib_util_logwtmp=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_nonposix_getpwnam_r" >&5
--$as_echo "$ac_cv_func_nonposix_getpwnam_r" >&6; }
-- if test "$ac_cv_func_nonposix_getpwnam_r" = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logwtmp" >&5
-+$as_echo "$ac_cv_lib_util_logwtmp" >&6; }
-+if test "x$ac_cv_lib_util_logwtmp" = x""yes; then :
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NONPOSIX_GETPWNAM_R 1
--_ACEOF
-
-- fi
--fi
-+$as_echo "#define HAVE_LOGWTMP 1" >>confdefs.h
-
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+fi
-
-
-
-+for ac_header in sys/time.h utmp.h utmpx.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$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
-
-+fi
-
-+done
-
--for ac_header in utmp.h utmpx.h libutil.h sys/param.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 "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-+if test "${ac_cv_header_time+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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+ ;
-+ 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
-- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_time=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
-+ ac_cv_header_time=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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-+$as_echo "$ac_cv_header_time" >&6; }
-+if test $ac_cv_header_time = yes; then
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
--# 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=gdm ##
--## ------------------------------------------------------------------ ##
--_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"'`
@@ -53979,715 +55075,38 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
--fi
-+if test "$ac_cv_header_utmpx_h" = "yes"; then
+-
++ XDMCP_SUPPORT_TRUE='#'
++ XDMCP_SUPPORT_FALSE=
+ fi
-done
-+$as_echo "#define UTMP struct utmpx" >>confdefs.h
-
-+else
-
-+$as_echo "#define UTMP struct utmp" >>confdefs.h
-
-+fi
-
--for ac_func in getutxent updwtmpx updwtmp
--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 "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if test "${ac_cv_header_time+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ GDMCHOOSER=gdmchooser
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host field in the utmp structure" >&5
-+$as_echo_n "checking for ut_host field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
- #else
--# include <assert.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
- #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
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
- #endif
--
- int
- main ()
- {
--return $ac_func ();
-+UTMP ut; char *p; p=ut.ut_host;
- ;
- 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"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ result=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "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
--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
-+$as_echo "#define HAVE_UT_UT_HOST 1" >>confdefs.h
-
- fi
--done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for login in -lutil" >&5
--$as_echo_n "checking for login in -lutil... " >&6; }
--if test "${ac_cv_lib_util_login+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lutil $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid field in the utmp structure" >&5
-+$as_echo_n "checking for ut_pid field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* 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"
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
- #endif
--char login ();
- int
- main ()
- {
--return login ();
-+UTMP ut; int i; i=ut.ut_pid;
- ;
- 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_util_login=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_util_login=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
-+ result=no
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
--$as_echo "$ac_cv_lib_util_login" >&6; }
--if test "x$ac_cv_lib_util_login" = x""yes; then
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LOGIN 1
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_PID 1" >>confdefs.h
-
-- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for logout in -lutil" >&5
--$as_echo_n "checking for logout in -lutil... " >&6; }
--if test "${ac_cv_lib_util_logout+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lutil $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_id field in the utmp structure" >&5
-+$as_echo_n "checking for ut_id field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* 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"
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
- #endif
--char logout ();
- int
- main ()
- {
--return logout ();
-+UTMP ut; char *p; p=ut.ut_id;
- ;
- 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_util_logout=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_util_logout=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
-+ result=no
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
--$as_echo "$ac_cv_lib_util_logout" >&6; }
--if test "x$ac_cv_lib_util_logout" = x""yes; then
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LOGOUT 1
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_ID 1" >>confdefs.h
-
-- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
--$as_echo_n "checking for logwtmp in -lutil... " >&6; }
--if test "${ac_cv_lib_util_logwtmp+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lutil $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_name field in the utmp structure" >&5
-+$as_echo_n "checking for ut_name field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* 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"
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
- #endif
--char logwtmp ();
- int
- main ()
- {
--return logwtmp ();
-+UTMP ut; char *p; p=ut.ut_name;
- ;
- 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_util_logwtmp=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_util_logwtmp=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
-+ result=no
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
--$as_echo "$ac_cv_lib_util_logwtmp" >&6; }
--if test "x$ac_cv_lib_util_logwtmp" = x""yes; then
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LOGWTMP 1
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_NAME 1" >>confdefs.h
-
-- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--
--
--
--
--
--for ac_header in sys/time.h utmp.h utmpx.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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_type field in the utmp structure" >&5
-+$as_echo_n "checking for ut_type field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#endif
-+int
-+main ()
-+{
-+UTMP ut; int i; i=(int) ut.ut_type;
-+ ;
-+ 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
-- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
-+ result=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; }
-+if test "$result" = "yes"; then
-
--# 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
-+$as_echo "#define HAVE_UT_UT_TYPE 1" >>confdefs.h
-
-- ac_header_preproc=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--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=gdm ##
--## ------------------------------------------------------------------ ##
--_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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_exit.e_termination field in the utmp structure" >&5
-+$as_echo_n "checking for ut_exit.e_termination field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#endif
-+int
-+main ()
-+{
-+UTMP ut; ut.ut_exit.e_termination=0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ result=no
- 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; }
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-
--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
-+$as_echo "#define HAVE_UT_UT_EXIT_E_TERMINATION 1" >>confdefs.h
-
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--done
--
--{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
--if test "${ac_cv_header_time+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_user field in the utmp structure" >&5
-+$as_echo_n "checking for ut_user field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-#include <sys/types.h>
-+#ifdef TIME_WITH_SYS_TIME
- #include <sys/time.h>
- #include <time.h>
--
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#endif
- int
- main ()
- {
+-#include <sys/time.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
-if ((struct tm *) 0)
-return 0;
-+UTMP ut; char *p; p=ut.ut_user;
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -54707,316 +55126,6 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_time=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_header_time=no
-+ result=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--$as_echo "$ac_cv_header_time" >&6; }
--if test $ac_cv_header_time = yes; then
-+if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define TIME_WITH_SYS_TIME 1
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_USER 1" >>confdefs.h
-
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--
--if test "$ac_cv_header_utmpx_h" = "yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define UTMP struct utmpx
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_time field in the utmp structure" >&5
-+$as_echo_n "checking for ut_time field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef TIME_WITH_SYS_TIME
-+#include <sys/time.h>
-+#include <time.h>
-+#else
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <time.h>
-+#endif
-+#endif
-+#ifdef HAVE_UTMP_H
-+#include <utmp.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#endif
-+int
-+main ()
-+{
-+UTMP ut; ut.ut_time=0;
-+ ;
-+ return 0;
-+}
- _ACEOF
--
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ result=yes
- else
-+ result=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define UTMP struct utmp
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_TIME 1" >>confdefs.h
-
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for ut_host field in the utmp structure" >&5
--$as_echo_n "checking for ut_host field in the utmp structure... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in the utmp structure" >&5
-+$as_echo_n "checking for ut_tv field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #ifdef TIME_WITH_SYS_TIME
- #include <sys/time.h>
-@@ -32686,55 +21630,28 @@
- int
- main ()
- {
--UTMP ut; char *p; p=ut.ut_host;
-+UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;
- ;
- 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 :
- result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- result=no
-+ result=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "$result" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_HOST 1
--_ACEOF
-+$as_echo "#define HAVE_UT_UT_TV 1" >>confdefs.h
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $result" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
- $as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for ut_pid field in the utmp structure" >&5
--$as_echo_n "checking for ut_pid field in the utmp structure... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_syslen field in the utmp structure" >&5
-+$as_echo_n "checking for ut_syslen field in the utmp structure... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #ifdef TIME_WITH_SYS_TIME
- #include <sys/time.h>
-@@ -32755,726 +21672,655 @@
- int
- main ()
- {
--UTMP ut; int i; i=ut.ut_pid;
-+UTMP ut; ut.ut_syslen=0;
- ;
- 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 :
- result=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ result=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "$result" = "yes"; then
-+
-+$as_echo "#define HAVE_UT_UT_SYSLEN 1" >>confdefs.h
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-+$as_echo "$result" >&6; }
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if utmpx structure has ut_syslen field" >&5
-+$as_echo_n "checking if utmpx structure has ut_syslen field... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ #include <utmpx.h>
-+int
-+main ()
-+{
-+
-+ struct utmpx record;
-+ record.ut_syslen = sizeof (record.ut_host);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ have_ut_syslen=yes
-+else
-+ have_ut_syslen=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test x$have_ut_syslen = xyes; then
-+
-+$as_echo "#define HAVE_UT_SYSLEN 1" >>confdefs.h
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ut_syslen" >&5
-+$as_echo "$have_ut_syslen" >&6; }
-+
-+
-+
-+XDMCP_LIBS=""
-+if test x$with_xdmcp != xno ; then
-+ xdmcp_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-+ ac_fn_c_check_header_compile "$LINENO" "X11/Xdmcp.h" "ac_cv_header_X11_Xdmcp_h" "#include <X11/Xproto.h>
-+"
-+if test "x$ac_cv_header_X11_Xdmcp_h" = x""yes; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpFlush in -lXdmcp" >&5
-+$as_echo_n "checking for XdmcpFlush in -lXdmcp... " >&6; }
-+if test "${ac_cv_lib_Xdmcp_XdmcpFlush+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXdmcp $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 XdmcpFlush ();
-+int
-+main ()
-+{
-+return XdmcpFlush ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_Xdmcp_XdmcpFlush=yes
-+else
-+ ac_cv_lib_Xdmcp_XdmcpFlush=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_Xdmcp_XdmcpFlush" >&5
-+$as_echo "$ac_cv_lib_Xdmcp_XdmcpFlush" >&6; }
-+if test "x$ac_cv_lib_Xdmcp_XdmcpFlush" = x""yes; then :
-+
-+
-+$as_echo "#define HAVE_LIBXDMCP 1" >>confdefs.h
-+
-+ XDMCP_LIBS="-lXdmcp"
-+ XDMCP_SUPPORT=yes
-+fi
-+
-+
-+fi
-+
-+
-+
-+ if test x$with_xdmcp = xyes -a "x$XDMCP_SUPPORT" = "x" ; then
-+ as_fn_error "XDMCP support requested but XDMCP libraries not found" "$LINENO" 5
-+ fi
-+ CPPFLAGS="$xdmcp_save_CPPFLAGS"
-+fi
-+
-+
-+if test "x$XDMCP_SUPPORT" = "xyes" ; then
-+ if true; then
-+ XDMCP_SUPPORT_TRUE=
-+ XDMCP_SUPPORT_FALSE='#'
-+else
-+ XDMCP_SUPPORT_TRUE='#'
-+ XDMCP_SUPPORT_FALSE=
-+fi
-+
-+ GDMCHOOSER=gdmchooser
-+else
+ # No need for TCP Wrappers in case XDMCP is disabled
+ if test x$with_tcp_wrappers != xno ; then
+ echo "TCP wrappers not needed if XDMCP is not enabled"
@@ -55025,17 +55134,35 @@
+ if false; then
+ XDMCP_SUPPORT_TRUE=
+ XDMCP_SUPPORT_FALSE='#'
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_header_time=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ XDMCP_SUPPORT_TRUE='#'
+ XDMCP_SUPPORT_FALSE=
-+fi
-+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-$as_echo "$ac_cv_header_time" >&6; }
+-if test $ac_cv_header_time = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
+-_ACEOF
+
+ GDMCHOOSER=
-+fi
-
-- result=no
-+
-+
+ fi
+
+
+-if test "$ac_cv_header_utmpx_h" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define UTMP struct utmpx
+-_ACEOF
+
+os_solaris=no
+case "$host" in
+ *solaris*) os_solaris=yes
@@ -55044,24 +55171,19 @@
+ if test x$os_solaris = xyes; then
+ OS_SOLARIS_TRUE=
+ OS_SOLARIS_FALSE='#'
-+else
+ else
+ OS_SOLARIS_TRUE='#'
+ OS_SOLARIS_FALSE=
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--if test "$result" = "yes"; then
--
++fi
+
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_PID 1
+-#define UTMP struct utmp
-_ACEOF
-fi
--{ $as_echo "$as_me:$LINENO: result: $result" >&5
--$as_echo "$result" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for ut_id field in the utmp structure" >&5
--$as_echo_n "checking for ut_id field in the utmp structure... " >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for ut_host field in the utmp structure" >&5
+-$as_echo_n "checking for ut_host field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55087,7 +55209,7 @@
-int
-main ()
-{
--UTMP ut; char *p; p=ut.ut_id;
+-UTMP ut; char *p; p=ut.ut_host;
- ;
- return 0;
-}
@@ -55138,7 +55260,7 @@
+ fi
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_ID 1
+-#define HAVE_UT_UT_HOST 1
-_ACEOF
+ if test -z "$LIBWRAP_PATH"; then
+ echo "*********************************************************"
@@ -55157,8 +55279,8 @@
-$as_echo "$result" >&6; }
+$as_echo "#define HAVE_TCPWRAPPERS 1" >>confdefs.h
--{ $as_echo "$as_me:$LINENO: checking for ut_name field in the utmp structure" >&5
--$as_echo_n "checking for ut_name field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_pid field in the utmp structure" >&5
+-$as_echo_n "checking for ut_pid field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55201,7 +55323,7 @@
int
main ()
{
--UTMP ut; char *p; p=ut.ut_name;
+-UTMP ut; int i; i=ut.ut_pid;
+return hosts_ctl ();
;
return 0;
@@ -55249,7 +55371,7 @@
+ LIBWRAP_PATH=auto
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_NAME 1
+-#define HAVE_UT_UT_PID 1
-_ACEOF
+$as_echo "#define HAVE_TCPWRAPPERS 1" >>confdefs.h
@@ -55257,8 +55379,8 @@
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
-$as_echo "$result" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for ut_type field in the utmp structure" >&5
--$as_echo_n "checking for ut_type field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_id field in the utmp structure" >&5
+-$as_echo_n "checking for ut_id field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55307,7 +55429,7 @@
int
main ()
{
--UTMP ut; int i; i=(int) ut.ut_type;
+-UTMP ut; char *p; p=ut.ut_id;
+return hosts_access;
;
return 0;
@@ -55345,7 +55467,7 @@
+else
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_TYPE 1
+-#define HAVE_UT_UT_ID 1
-_ACEOF
+OLD_LIBS="$LIBS"
+LIBS="$LIBS -lnsl"
@@ -55358,8 +55480,8 @@
+#include <tcpd.h>
+int allow_severity, deny_severity;
--{ $as_echo "$as_me:$LINENO: checking for ut_exit.e_termination field in the utmp structure" >&5
--$as_echo_n "checking for ut_exit.e_termination field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_name field in the utmp structure" >&5
+-$as_echo_n "checking for ut_name field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55385,7 +55507,7 @@
int
main ()
{
--UTMP ut; ut.ut_exit.e_termination=0;
+-UTMP ut; char *p; p=ut.ut_name;
+return hosts_access;
;
return 0;
@@ -55441,7 +55563,7 @@
-if test "$result" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_EXIT_E_TERMINATION 1
+-#define HAVE_UT_UT_NAME 1
-_ACEOF
+
+
@@ -55454,8 +55576,8 @@
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
-$as_echo "$result" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for ut_user field in the utmp structure" >&5
--$as_echo_n "checking for ut_user field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_type field in the utmp structure" >&5
+-$as_echo_n "checking for ut_type field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55499,7 +55621,7 @@
int
main ()
{
--UTMP ut; char *p; p=ut.ut_user;
+-UTMP ut; int i; i=(int) ut.ut_type;
+return XOpenDevice ();
;
return 0;
@@ -55538,7 +55660,7 @@
-if test "$result" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_USER 1
+-#define HAVE_UT_UT_TYPE 1
-_ACEOF
-
+rm -f core conftest.err conftest.$ac_objext \
@@ -55553,8 +55675,8 @@
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
-$as_echo "$result" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for ut_time field in the utmp structure" >&5
--$as_echo_n "checking for ut_time field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_exit.e_termination field in the utmp structure" >&5
+-$as_echo_n "checking for ut_exit.e_termination field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55591,7 +55713,7 @@
int
main ()
{
--UTMP ut; ut.ut_time=0;
+-UTMP ut; ut.ut_exit.e_termination=0;
+XOpenDevice()
;
return 0;
@@ -55647,7 +55769,7 @@
-if test "$result" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_TIME 1
+-#define HAVE_UT_UT_EXIT_E_TERMINATION 1
-_ACEOF
+if test "x$have_xinput" = xyes; then
@@ -55658,8 +55780,8 @@
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
-$as_echo "$result" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for ut_tv field in the utmp structure" >&5
--$as_echo_n "checking for ut_tv field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_user field in the utmp structure" >&5
+-$as_echo_n "checking for ut_user field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55712,7 +55834,7 @@
int
main ()
{
--UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;
+-UTMP ut; char *p; p=ut.ut_user;
+return XineramaQueryExtension ();
;
return 0;
@@ -55765,31 +55887,31 @@
+$as_echo "#define HAVE_XFREE_XINERAMA 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_TV 1
+-#define HAVE_UT_UT_USER 1
-_ACEOF
+$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h
+
+ XINERAMA_LIBS="-lXinerama"
+ XINERAMA_SUPPORT=yes
-+else
-+ use_xfree_xinerama=no
-+fi
-+
-+
+else
+ use_xfree_xinerama=no
fi
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
-$as_echo "$result" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for ut_syslen field in the utmp structure" >&5
--$as_echo_n "checking for ut_syslen field in the utmp structure... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for ut_time field in the utmp structure" >&5
+-$as_echo_n "checking for ut_time field in the utmp structure... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++else
++ use_xfree_xinerama=no
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on XFree86" >&5
+$as_echo_n "checking for Xinerama support on XFree86... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_xfree_xinerama" >&5
@@ -55834,7 +55956,7 @@
int
main ()
{
--UTMP ut; ut.ut_syslen=0;
+-UTMP ut; ut.ut_time=0;
+return XineramaGetInfo ();
;
return 0;
@@ -55864,8 +55986,6 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- result=no
+ ac_cv_lib_Xext_XineramaGetInfo=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
@@ -55878,10 +55998,8 @@
+ use_solaris_xinerama=yes
+else
+ use_solaris_xinerama=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--if test "$result" = "yes"; then
++fi
++
+ if test "x$use_solaris_xinerama" = "xyes"; then
+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xinerama.h" "ac_cv_header_X11_extensions_xinerama_h" "#include <X11/Xlib.h>
+"
@@ -55891,22 +56009,253 @@
+ fi
+
+$as_echo "#define HAVE_SOLARIS_XINERAMA 1" >>confdefs.h
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_UT_UT_SYSLEN 1
--_ACEOF
-
--fi
--{ $as_echo "$as_me:$LINENO: result: $result" >&5
--$as_echo "$result" >&6; }
++
++
+$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h
-
++
+ XINERAMA_LIBS=""
+ XINERAMA_SUPPORT=yes
+else
+ use_solaris_xinerama=no
+fi
-
++
+
+- result=no
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5
++$as_echo_n "checking for Xinerama support on Solaris... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_solaris_xinerama" >&5
++$as_echo "$use_solaris_xinerama" >&6; };
++ fi
++ fi
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-if test "$result" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UT_UT_TIME 1
+-_ACEOF
++CPPFLAGS="$xinerama_save_cppflags"
++
++
++if test "x$with_selinux" = "xyes" ; then
++ echo "SELinux support requested (--with-selinux was given), checking prerequisites"
++ if test -d /usr/local/selinux/include ; then
++ echo "Found /usr/local/selinux/include, will look there for SELinux stuff as well"
++ CFLAGS="$CFLAGS -I/usr/local/selinux/include"
++ LDFLAGS="$LDFLAGS -L/usr/local/selinux/lib"
++ fi
++ ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
++if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $result" >&5
+-$as_echo "$result" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for ut_tv field in the utmp structure" >&5
+-$as_echo_n "checking for ut_tv field in the utmp structure... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifdef TIME_WITH_SYS_TIME
+-#include <sys/time.h>
+-#include <time.h>
+-#else
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/time.h>
+-#else
+-#include <time.h>
+-#endif
+-#endif
+-#ifdef HAVE_UTMP_H
+-#include <utmp.h>
+-#endif
+-#ifdef HAVE_UTMPX_H
+-#include <utmpx.h>
++
++ ac_fn_c_check_header_mongrel "$LINENO" "selinux/get_context_list.h" "ac_cv_header_selinux_get_context_list_h" "$ac_includes_default"
++if test "x$ac_cv_header_selinux_get_context_list_h" = x""yes; then :
++
++fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for attr_get in -lattr" >&5
++$as_echo_n "checking for attr_get in -lattr... " >&6; }
++if test "${ac_cv_lib_attr_attr_get+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lattr $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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 attr_get ();
+ int
+ main ()
+ {
+-UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;
++return attr_get ();
+ ;
+ 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
+- result=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_attr_attr_get=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- result=no
++ ac_cv_lib_attr_attr_get=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-if test "$result" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UT_UT_TV 1
+-_ACEOF
+-
++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_attr_attr_get" >&5
++$as_echo "$ac_cv_lib_attr_attr_get" >&6; }
++if test "x$ac_cv_lib_attr_attr_get" = x""yes; then :
++ /bin/true
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $result" >&5
+-$as_echo "$result" >&6; }
+
+-{ $as_echo "$as_me:$LINENO: checking for ut_syslen field in the utmp structure" >&5
+-$as_echo_n "checking for ut_syslen field in the utmp structure... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ # I'm anal and I don't know which versions have which symbols,
++ # so I check for all the ones we use
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_ordered_context_list in -lselinux" >&5
++$as_echo_n "checking for get_ordered_context_list in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_get_ordered_context_list+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lselinux $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#ifdef TIME_WITH_SYS_TIME
+-#include <sys/time.h>
+-#include <time.h>
+-#else
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/time.h>
+-#else
+-#include <time.h>
+-#endif
+-#endif
+-#ifdef HAVE_UTMP_H
+-#include <utmp.h>
+-#endif
+-#ifdef HAVE_UTMPX_H
+-#include <utmpx.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 get_ordered_context_list ();
+ int
+ main ()
+ {
+-UTMP ut; ut.ut_syslen=0;
++return get_ordered_context_list ();
+ ;
+ 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
+- result=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_selinux_get_ordered_context_list=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- result=no
++ ac_cv_lib_selinux_get_ordered_context_list=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-if test "$result" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UT_UT_SYSLEN 1
+-_ACEOF
+-
++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_selinux_get_ordered_context_list" >&5
++$as_echo "$ac_cv_lib_selinux_get_ordered_context_list" >&6; }
++if test "x$ac_cv_lib_selinux_get_ordered_context_list" = x""yes; then :
++ /bin/true
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $result" >&5
+-$as_echo "$result" >&6; }
+-
+-
-{ $as_echo "$as_me:$LINENO: checking if utmpx structure has ut_syslen field" >&5
-$as_echo_n "checking if utmpx structure has ut_syslen field... " >&6; }
@@ -55915,29 +56264,36 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5
-+$as_echo_n "checking for Xinerama support on Solaris... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_solaris_xinerama" >&5
-+$as_echo "$use_solaris_xinerama" >&6; };
-+ fi
-+ fi
-+fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freecon in -lselinux" >&5
++$as_echo_n "checking for freecon in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_freecon+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lselinux $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
- #include <utmpx.h>
--int
--main ()
--{
-
++/* 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 freecon ();
+ int
+ main ()
+ {
+-
- struct utmpx record;
- record.ut_syslen = sizeof (record.ut_host);
-+CPPFLAGS="$xinerama_save_cppflags"
-
-- ;
-- return 0;
--}
--_ACEOF
+-
++return freecon ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -55957,37 +56313,74 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- have_ut_syslen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_selinux_freecon=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- have_ut_syslen=no
-+if test "x$with_selinux" = "xyes" ; then
-+ echo "SELinux support requested (--with-selinux was given), checking prerequisites"
-+ if test -d /usr/local/selinux/include ; then
-+ echo "Found /usr/local/selinux/include, will look there for SELinux stuff as well"
-+ CFLAGS="$CFLAGS -I/usr/local/selinux/include"
-+ LDFLAGS="$LDFLAGS -L/usr/local/selinux/lib"
-+ fi
-+ ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
-+if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
-
+-
++ ac_cv_lib_selinux_freecon=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_selinux_freecon" >&5
++$as_echo "$ac_cv_lib_selinux_freecon" >&6; }
++if test "x$ac_cv_lib_selinux_freecon" = x""yes; then :
++ /bin/true
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test x$have_ut_syslen = xyes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freeconary in -lselinux" >&5
++$as_echo_n "checking for freeconary in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_freeconary+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lselinux $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UT_SYSLEN 1
--_ACEOF
-+ ac_fn_c_check_header_mongrel "$LINENO" "selinux/get_context_list.h" "ac_cv_header_selinux_get_context_list_h" "$ac_includes_default"
-+if test "x$ac_cv_header_selinux_get_context_list_h" = x""yes; then :
-
++/* 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 freeconary ();
++int
++main ()
++{
++return freeconary ();
++ ;
++ return 0;
++}
+ _ACEOF
+-
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_selinux_freeconary=yes
++else
++ ac_cv_lib_selinux_freeconary=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_selinux_freeconary" >&5
++$as_echo "$ac_cv_lib_selinux_freeconary" >&6; }
++if test "x$ac_cv_lib_selinux_freeconary" = x""yes; then :
++ /bin/true
fi
-{ $as_echo "$as_me:$LINENO: result: $have_ut_syslen" >&5
-$as_echo "$have_ut_syslen" >&6; }
-
-
+-
-XDMCP_LIBS=""
-if test x$with_xdmcp != xno ; then
@@ -55996,9 +56389,9 @@
- { $as_echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5
-$as_echo_n "checking for X11/Xdmcp.h... " >&6; }
-if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for attr_get in -lattr" >&5
-+$as_echo_n "checking for attr_get in -lattr... " >&6; }
-+if test "${ac_cv_lib_attr_attr_get+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon in -lselinux" >&5
++$as_echo_n "checking for setexeccon in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_setexeccon+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -56007,7 +56400,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lattr $LIBS"
++LIBS="-lselinux $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Xproto.h>
@@ -56019,11 +56412,11 @@
+#ifdef __cplusplus
+extern "C"
+#endif
-+char attr_get ();
++char setexeccon ();
+int
+main ()
+{
-+return attr_get ();
++return setexeccon ();
+ ;
+ return 0;
+}
@@ -56048,13 +56441,13 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_Xdmcp_h=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_attr_attr_get=yes
++ ac_cv_lib_selinux_setexeccon=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_Xdmcp_h=no
-+ ac_cv_lib_attr_attr_get=no
++ ac_cv_lib_selinux_setexeccon=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -56062,9 +56455,9 @@
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_attr_get" >&5
-+$as_echo "$ac_cv_lib_attr_attr_get" >&6; }
-+if test "x$ac_cv_lib_attr_attr_get" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon" >&5
++$as_echo "$ac_cv_lib_selinux_setexeccon" >&6; }
++if test "x$ac_cv_lib_selinux_setexeccon" = x""yes; then :
+ /bin/true
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5
@@ -56074,11 +56467,9 @@
- { $as_echo "$as_me:$LINENO: checking for XdmcpFlush in -lXdmcp" >&5
-$as_echo_n "checking for XdmcpFlush in -lXdmcp... " >&6; }
-if test "${ac_cv_lib_Xdmcp_XdmcpFlush+set}" = set; then
-+ # I'm anal and I don't know which versions have which symbols,
-+ # so I check for all the ones we use
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_ordered_context_list in -lselinux" >&5
-+$as_echo_n "checking for get_ordered_context_list in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_get_ordered_context_list+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
++$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -56093,17 +56484,17 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -33483,169 +22329,118 @@
+@@ -33483,690 +22637,303 @@
#ifdef __cplusplus
extern "C"
#endif
-char XdmcpFlush ();
-+char get_ordered_context_list ();
++char is_selinux_enabled ();
int
main ()
{
-return XdmcpFlush ();
-+return get_ordered_context_list ();
++return is_selinux_enabled ();
;
return 0;
}
@@ -56131,39 +56522,68 @@
- }; then
- ac_cv_lib_Xdmcp_XdmcpFlush=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_get_ordered_context_list=yes
++ ac_cv_lib_selinux_is_selinux_enabled=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_lib_selinux_is_selinux_enabled=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_selinux_is_selinux_enabled" >&5
++$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
++if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then :
++ /bin/true
++fi
++
++
++$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+
- ac_cv_lib_Xdmcp_XdmcpFlush=no
-+ ac_cv_lib_selinux_get_ordered_context_list=no
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
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
+-LIBS=$ac_check_lib_save_LIBS
++
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
++
++$as_echo "#define WITH_CONSOLE_KIT 1" >>confdefs.h
++
++fi
++ if test x$use_console_kit = xyes; then
++ WITH_CONSOLE_KIT_TRUE=
++ WITH_CONSOLE_KIT_FALSE='#'
++else
++ WITH_CONSOLE_KIT_TRUE='#'
++ WITH_CONSOLE_KIT_FALSE=
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_XdmcpFlush" >&5
-$as_echo "$ac_cv_lib_Xdmcp_XdmcpFlush" >&6; }
-if test "x$ac_cv_lib_Xdmcp_XdmcpFlush" = x""yes; then
--
--
+
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXDMCP 1
-_ACEOF
--
+
- XDMCP_LIBS="-lXdmcp"
- XDMCP_SUPPORT=yes
-fi
--
--
--fi
--
--
+
+
++# Check whether --with-dbus-sys was given.
++if test "${with_dbus_sys+set}" = set; then :
++ withval=$with_dbus_sys;
+ fi
+
+
-
- if test x$with_xdmcp = xyes -a "x$XDMCP_SUPPORT" = "x" ; then
- { { $as_echo "$as_me:$LINENO: error: XDMCP support requested but XDMCP libraries not found" >&5
@@ -56171,29 +56591,23 @@
- { (exit 1); exit 1; }; }
- fi
- CPPFLAGS="$xdmcp_save_CPPFLAGS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_get_ordered_context_list" >&5
-+$as_echo "$ac_cv_lib_selinux_get_ordered_context_list" >&6; }
-+if test "x$ac_cv_lib_selinux_get_ordered_context_list" = x""yes; then :
-+ /bin/true
++# Check whether --with-dbus-services was given.
++if test "${with_dbus_services+set}" = set; then :
++ withval=$with_dbus_services;
fi
--
+
-if test "x$XDMCP_SUPPORT" = "xyes" ; then
- if true; then
- XDMCP_SUPPORT_TRUE=
- XDMCP_SUPPORT_FALSE='#'
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freecon in -lselinux" >&5
-+$as_echo_n "checking for freecon in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_freecon+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ! test -z "$with_dbus_sys" ; then
++ DBUS_SYS_DIR="$with_dbus_sys"
else
- XDMCP_SUPPORT_TRUE='#'
- XDMCP_SUPPORT_FALSE=
--fi
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lselinux $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
+ fi
- GDMCHOOSER=gdmchooser
-else
@@ -56205,37 +56619,29 @@
- if false; then
- XDMCP_SUPPORT_TRUE=
- XDMCP_SUPPORT_FALSE='#'
-+/* 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 freecon ();
-+int
-+main ()
-+{
-+return freecon ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_freecon=yes
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 domain" >&5
++$as_echo_n "checking whether iso-codes has iso-639 domain... " >&6; }
++if $PKG_CONFIG --variable=domains iso-codes | grep 639 >/dev/null ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
else
- XDMCP_SUPPORT_TRUE='#'
- XDMCP_SUPPORT_FALSE=
-+ ac_cv_lib_selinux_freecon=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
--
+
- GDMCHOOSER=
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--
--
--
+-fi
++cat >>confdefs.h <<_ACEOF
++#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
++_ACEOF
+
++ISO_CODES=iso-codes
+
+
-os_solaris=no
-case "$host" in
- *solaris*) os_solaris=yes
@@ -56244,24 +56650,24 @@
- if test x$os_solaris = xyes; then
- OS_SOLARIS_TRUE=
- OS_SOLARIS_FALSE='#'
--else
++
++msg_rbac_shutdown=no
++# Check whether --enable-rbac-shutdown was given.
++if test "${enable_rbac_shutdown+set}" = set; then :
++ enableval=$enable_rbac_shutdown; enable_rbac_shutdown=$enableval
+ else
- OS_SOLARIS_TRUE='#'
- OS_SOLARIS_FALSE=
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_freecon" >&5
-+$as_echo "$ac_cv_lib_selinux_freecon" >&6; }
-+if test "x$ac_cv_lib_selinux_freecon" = x""yes; then :
-+ /bin/true
++ enable_rbac_shutdown=no
fi
--
--
+
++if test "x$enable_rbac_shutdown" != "xno"; then
++ RBAC_LIBS="-lsecdb -lsocket -lnsl"
+
-if test x$with_tcp_wrappers = xno ; then
- echo "TCP wrappers disabled"
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freeconary in -lselinux" >&5
-+$as_echo_n "checking for freeconary in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_freeconary+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- LIBWRAP_PATH=""
- if test x$os_solaris = xyes ; then
- if test -f /usr/lib/libwrap.so; then
@@ -56277,7 +56683,8 @@
- nm $LIBWRAP_PATH | grep 'T setenv' && LIBWRAP_PATH=""
- fi
- fi
--
++$as_echo "#define ENABLE_RBAC_SHUTDOWN /**/" >>confdefs.h
+
- if test -z "$LIBWRAP_PATH"; then
- echo "*********************************************************"
- echo " You have a broken TCP wrappers library (setenv included)"
@@ -56289,79 +56696,54 @@
- echo "*********************************************************"
- else
- LIBWRAP_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lwrap"
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lselinux $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TCPWRAPPERS 1
-+/* 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 freeconary ();
-+int
-+main ()
-+{
-+return freeconary ();
-+ ;
-+ return 0;
-+}
++cat >>confdefs.h <<_ACEOF
++#define RBAC_SHUTDOWN_KEY "$enable_rbac_shutdown"
_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_freeconary=yes
-+else
-+ ac_cv_lib_selinux_freeconary=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_selinux_freeconary" >&5
-+$as_echo "$ac_cv_lib_selinux_freeconary" >&6; }
-+if test "x$ac_cv_lib_selinux_freeconary" = x""yes; then :
-+ /bin/true
-+fi
- fi
- else
- { $as_echo "$as_me:$LINENO: checking for hosts_ctl in -lwrap" >&5
-$as_echo_n "checking for hosts_ctl in -lwrap... " >&6; }
-if test "${ac_cv_lib_wrap_hosts_ctl+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon in -lselinux" >&5
-+$as_echo_n "checking for setexeccon in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_setexeccon+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwrap $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lselinux $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -33654,519 +22449,343 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* end confdefs.h. */
++ msg_rbac_shutdown="yes, using key $enable_rbac_shutdown"
++fi
+
+-/* 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 hosts_ctl ();
-+char setexeccon ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return hosts_ctl ();
-+return setexeccon ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++
++
++
++for ac_header in execinfo.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
++if test "x$ac_cv_header_execinfo_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_EXECINFO_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -56385,42 +56767,36 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_wrap_hosts_ctl=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_setexeccon=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_lib_wrap_hosts_ctl=no
-+ ac_cv_lib_selinux_setexeccon=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
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_hosts_ctl" >&5
-$as_echo "$ac_cv_lib_wrap_hosts_ctl" >&6; }
-if test "x$ac_cv_lib_wrap_hosts_ctl" = x""yes; then
--
++done
+
- LIBWRAP_LIBS="-lwrap"
- LIBWRAP_PATH=auto
--
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TCPWRAPPERS 1
-_ACEOF
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon" >&5
-+$as_echo "$ac_cv_lib_selinux_setexeccon" >&6; }
-+if test "x$ac_cv_lib_selinux_setexeccon" = x""yes; then :
-+ /bin/true
- fi
+
+-fi
++authdir=${localstatedir}/lib/gdm
- fi
--
++gdmlocaledir=${gdmconfdir}
+
- { $as_echo "$as_me:$LINENO: checking whether to use TCP wrappers" >&5
-$as_echo_n "checking whether to use TCP wrappers... " >&6; }
- if test -n "$LIBWRAP_PATH"; then
@@ -56430,7 +56806,8 @@
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- fi
--
++pixmapdir=${datadir}/pixmaps
+
- LIB_NSL=
- if test -n "$LIBWRAP_PATH"; then
- { $as_echo "$as_me:$LINENO: checking whether -lwrap also requires -lnsl" >&5
@@ -56442,35 +56819,19 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
-+$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
-+if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lselinux $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <tcpd.h>
-int allow_severity, deny_severity;
--
-+/* 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 is_selinux_enabled ();
- int
- main ()
- {
+
+-int
+-main ()
+-{
-return hosts_access;
-+return is_selinux_enabled ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -56493,22 +56854,20 @@
- $as_test_x conftest$ac_exeext
- }; then
- :
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_selinux_is_selinux_enabled=yes
++# Check whether --with-log-dir was given.
++if test "${with_log_dir+set}" = set; then :
++ withval=$with_log_dir;
++fi
++
++
++if ! test -z "$with_log_dir"; then
++ GDM_LOG_DIR=$with_log_dir
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_selinux_is_selinux_enabled=no
++ GDM_LOG_DIR=/var/log/gdm
+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_selinux_is_selinux_enabled" >&5
-+$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
-+if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then :
-+ /bin/true
-+fi
++logdir=$GDM_LOG_DIR
-OLD_LIBS="$LIBS"
@@ -56519,11 +56878,13 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
++withval=""
-#include <tcpd.h>
-int allow_severity, deny_severity;
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
++# Check whether --with-at-bindir was given.
++if test "${with_at_bindir+set}" = set; then :
++ withval=$with_at_bindir;
+fi
-int
@@ -56557,31 +56918,22 @@
- }; then
- LIB_NSL="-lnsl"
+
-+use_console_kit=no
-+if test "x$with_console_kit" != "xno" ; then
-+ use_console_kit=yes
-+
-+$as_echo "#define WITH_CONSOLE_KIT 1" >>confdefs.h
-+
-+fi
-+ if test x$use_console_kit = xyes; then
-+ WITH_CONSOLE_KIT_TRUE=
-+ WITH_CONSOLE_KIT_FALSE='#'
++if test x$withval != x; then
++ AT_BINDIR="$withval"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ WITH_CONSOLE_KIT_TRUE='#'
-+ WITH_CONSOLE_KIT_FALSE=
++ AT_BINDIR='${bindir}'
+fi
+
+
++
++withval=""
- LIBWRAP_PATH=""
-+
-+
-+# Check whether --with-dbus-sys was given.
-+if test "${with_dbus_sys+set}" = set; then :
-+ withval=$with_dbus_sys;
++# Check whether --with-defaults_conf was given.
++if test "${with_defaults_conf+set}" = set; then :
++ withval=$with_defaults_conf;
fi
-rm -rf conftest.dSYM
@@ -56589,9 +56941,10 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS="$OLD_LIBS"
-+# Check whether --with-dbus-services was given.
-+if test "${with_dbus_services+set}" = set; then :
-+ withval=$with_dbus_services;
++if test x$withval != x; then
++ GDM_DEFAULTS_CONF="$withval"
++else
++ GDM_DEFAULTS_CONF='${datadir}/gdm/defaults.conf'
fi
-rm -rf conftest.dSYM
@@ -56600,71 +56953,56 @@
- LIBS="$ORIG_LIBS"
- if test -n "$LIB_NSL"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+
-+if ! test -z "$with_dbus_sys" ; then
-+ DBUS_SYS_DIR="$with_dbus_sys"
-+else
-+ DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
-+fi
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 domain" >&5
-+$as_echo_n "checking whether iso-codes has iso-639 domain... " >&6; }
-+if $PKG_CONFIG --variable=domains iso-codes | grep 639 >/dev/null ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+-$as_echo "yes" >&6; }
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS $LIB_NSL"
- else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
+-$as_echo "no" >&6; }
- fi
- fi
++
++
++withval=""
++
++# Check whether --with-custom_conf was given.
++if test "${with_custom_conf+set}" = set; then :
++ withval=$with_custom_conf;
fi
-+cat >>confdefs.h <<_ACEOF
-+#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`"
-+_ACEOF
-
-+ISO_CODES=iso-codes
-
+
++if test x$withval != x; then
++ GDM_CUSTOM_CONF="$withval"
++else
++ GDM_CUSTOM_CONF='${gdmconfdir}/custom.conf'
++fi
++
+
++GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
-if $PKG_CONFIG --exists xft ; then
-+msg_rbac_shutdown=no
-+# Check whether --enable-rbac-shutdown was given.
-+if test "${enable_rbac_shutdown+set}" = set; then :
-+ enableval=$enable_rbac_shutdown; enable_rbac_shutdown=$enableval
-+else
-+ enable_rbac_shutdown=no
-+fi
-+
-+
-+if test "x$enable_rbac_shutdown" != "xno"; then
-+ RBAC_LIBS="-lsecdb -lsocket -lnsl"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XFT2 /**/
-+$as_echo "#define ENABLE_RBAC_SHUTDOWN /**/" >>confdefs.h
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define RBAC_SHUTDOWN_KEY "$enable_rbac_shutdown"
- _ACEOF
-
-+ msg_rbac_shutdown="yes, using key $enable_rbac_shutdown"
+-_ACEOF
+
++# Check whether --with-xevie was given.
++if test "${with_xevie+set}" = set; then :
++ withval=$with_xevie;
++else
++ with_xevie=no
fi
-
+-
-have_xinput=
-{ $as_echo "$as_me:$LINENO: checking for XOpenDevice in -lXi" >&5
-$as_echo_n "checking for XOpenDevice in -lXi... " >&6; }
-if test "${ac_cv_lib_Xi_XOpenDevice+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++if test x$with_xevie != xno ; then
++ XEVIE_OPTION="+extension XEVIE"
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXi $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -56673,6 +57011,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ XEVIE_OPTION=""
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -56688,12 +57028,10 @@
- ;
- return 0;
-}
-+for ac_header in execinfo.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXECINFO_H 1
++
++
++cat >>confdefs.h <<_ACEOF
++#define XEVIE_OPTION "$XEVIE_OPTION"
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -56722,7 +57060,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_Xi_XOpenDevice=no
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -56734,7 +57072,6 @@
-if test "x$ac_cv_lib_Xi_XOpenDevice" = x""yes; then
- XINPUT_LIBS=-lXi
-fi
-+done
-if test "x$XINPUT_LIBS" = x; then
- save_LIBS="$LIBS"
@@ -56750,16 +57087,29 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--int
--main ()
--{
++# Check for Solaris auditing API
++# Note, Solaris auditing not supported for Solaris 9 or earlier and
++# should not be used on these versions of Solaris if auditing is
++# required. Solaris auditing is only supported on systems that
++# support the ADT_USER enumeration value.
++#
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris auditing API" >&5
++$as_echo_n "checking for Solaris auditing API... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <bsm/adt.h>
++adt_user_context = ADT_USER;
++
+ int
+ main ()
+ {
-XOpenDevice()
-- ;
-- return 0;
--}
--_ACEOF
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -56781,7 +57131,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-
+-
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- XINPUT_LIBS="$XINPUT_RPATH_FLAGS -L$xinputpath -lXi"
@@ -56790,21 +57140,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+authdir=${localstatedir}/lib/gdm
-+
-+gdmlocaledir=${gdmconfdir}
-
+-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-+pixmapdir=${datadir}/pixmaps
-+
-+
-+
-+# Check whether --with-log-dir was given.
-+if test "${with_log_dir+set}" = set; then :
-+ withval=$with_log_dir;
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -56814,26 +57154,13 @@
-$as_echo "$as_me: error: Couldn't find the XInput library. Check config.log for details" >&2;}
- { (exit 1); exit 1; }; }
- fi
-+
-+if ! test -z "$with_log_dir"; then
-+ GDM_LOG_DIR=$with_log_dir
-+else
-+ GDM_LOG_DIR=/var/log/gdm
- fi
+-fi
-if test "${ac_cv_header_X11_extensions_XInput_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for X11/extensions/XInput.h" >&5
-$as_echo_n "checking for X11/extensions/XInput.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_XInput_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-+logdir=$GDM_LOG_DIR
-+
-+
-+withval=""
-+
-+# Check whether --with-at-bindir was given.
-+if test "${with_at_bindir+set}" = set; then :
-+ withval=$with_at_bindir;
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XInput_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_XInput_h" >&6; }
-else
@@ -56868,30 +57195,20 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+
-+
-+if test x$withval != x; then
-+ AT_BINDIR="$withval"
++if ac_fn_c_try_compile "$LINENO"; then :
++ check_sun_audit=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ AT_BINDIR='${bindir}'
-+fi
-+
-+
-+
-+withval=""
-
+-
- ac_header_compiler=no
-+# Check whether --with-defaults_conf was given.
-+if test "${with_defaults_conf+set}" = set; then :
-+ withval=$with_defaults_conf;
++ check_sun_audit=no
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ 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 X11/extensions/XInput.h presence" >&5
-$as_echo_n "checking X11/extensions/XInput.h presence... " >&6; }
@@ -56921,27 +57238,19 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if test x$withval != x; then
-+ GDM_DEFAULTS_CONF="$withval"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ GDM_DEFAULTS_CONF='${datadir}/gdm/defaults.conf'
-+fi
- ac_header_preproc=no
-+
-+
-+withval=""
-+
-+# Check whether --with-custom_conf was given.
-+if test "${with_custom_conf+set}" = set; then :
-+ withval=$with_custom_conf;
- fi
+-fi
++if test ${check_sun_audit} = yes
++then
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++$as_echo "#define HAVE_ADT 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -56977,121 +57286,60 @@
-$as_echo_n "checking for X11/extensions/XInput.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_XInput_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-+if test x$withval != x; then
-+ GDM_CUSTOM_CONF="$withval"
++ PAM_LIBS="$PAM_LIBS -lbsm"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
else
- ac_cv_header_X11_extensions_XInput_h=$ac_header_preproc
-+ GDM_CUSTOM_CONF='${gdmconfdir}/custom.conf'
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XInput_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_XInput_h" >&6; }
-
-+
-+GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
-+
-+
-+
-+
-+# Check whether --with-xevie was given.
-+if test "${with_xevie+set}" = set; then :
-+ withval=$with_xevie;
-+else
-+ with_xevie=no
+-
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-if test "x$ac_cv_header_X11_extensions_XInput_h" = x""yes; then
- have_xinput=yes
-+
-+
-+if test x$with_xevie != xno ; then
-+ XEVIE_OPTION="+extension XEVIE"
-+else
-+ XEVIE_OPTION=""
- fi
-
-
--if test "x$have_xinput" = xyes; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_XINPUT 1
-+cat >>confdefs.h <<_ACEOF
-+#define XEVIE_OPTION "$XEVIE_OPTION"
- _ACEOF
-
-- X_EXTRA_LIBS="$X_EXTRA_LIBS $XINPUT_LIBS"
-+
-+
-+# Check for Solaris auditing API
-+# Note, Solaris auditing not supported for Solaris 9 or earlier and
-+# should not be used on these versions of Solaris if auditing is
-+# required. Solaris auditing is only supported on systems that
-+# support the ADT_USER enumeration value.
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris auditing API" >&5
-+$as_echo_n "checking for Solaris auditing API... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <bsm/adt.h>
-+adt_user_context = ADT_USER;
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ check_sun_audit=yes
-+else
-+ check_sun_audit=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-+if test ${check_sun_audit} = yes
-+then
-
-+$as_echo "#define HAVE_ADT 1" >>confdefs.h
-
--# X11 Xinerama extension
--# Check for Xinerama extension (Solaris impl or Xfree impl)
--xinerama_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-+ PAM_LIBS="$PAM_LIBS -lbsm"
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ if test x$check_sun_audit = xyes; then
+ HAVE_ADT_TRUE=
+ HAVE_ADT_FALSE='#'
+else
+ HAVE_ADT_TRUE='#'
+ HAVE_ADT_FALSE=
-+fi
-
+ fi
+
+
+-if test "x$have_xinput" = xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_XINPUT 1
+-_ACEOF
++# Check for Linux auditing API
++#
+
+- X_EXTRA_LIBS="$X_EXTRA_LIBS $XINPUT_LIBS"
++# Check whether --with-libaudit was given.
++if test "${with_libaudit+set}" = set; then :
++ withval=$with_libaudit;
++else
++ with_libaudit=auto
+ fi
+
+
+-
+-# X11 Xinerama extension
+-# Check for Xinerama extension (Solaris impl or Xfree impl)
+-xinerama_save_cppflags="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-
-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-
+-
-if test ! x$with_xinerama = xno ; then
- # Check for XFree
- use_xfree_xinerama=yes
- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
-$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; }
-if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
-+# Check for Linux auditing API
-+#
-+
-+# Check whether --with-libaudit was given.
-+if test "${with_libaudit+set}" = set; then :
-+ withval=$with_libaudit;
-+else
-+ with_libaudit=auto
-+fi
-+
-+
+# libaudit detection
+if test x$with_libaudit = xno ; then
+ have_libaudit=no;
@@ -57114,7 +57362,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -34175,143 +22794,73 @@
+@@ -34175,143 +22942,73 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57175,11 +57423,7 @@
-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_log_user_message" >&5
-+$as_echo "$ac_cv_lib_audit_audit_log_user_message" >&6; }
-+if test "x$ac_cv_lib_audit_audit_log_user_message" = x""yes; then :
-+ have_libaudit=yes
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -57187,9 +57431,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/Xlib.h>
-+ have_libaudit=no
-+fi
-
+-
-#include <X11/extensions/Xinerama.h>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -57211,12 +57453,20 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_Xinerama_h=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_log_user_message" >&5
++$as_echo "$ac_cv_lib_audit_audit_log_user_message" >&6; }
++if test "x$ac_cv_lib_audit_audit_log_user_message" = x""yes; then :
++ have_libaudit=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ have_libaudit=no
+fi
- ac_cv_header_X11_extensions_Xinerama_h=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test x$have_libaudit = xyes; then
+ HAVE_LIBAUDIT_TRUE=
+ HAVE_LIBAUDIT_FALSE='#'
@@ -57224,15 +57474,6 @@
+ HAVE_LIBAUDIT_TRUE='#'
+ HAVE_LIBAUDIT_FALSE=
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test x$have_libaudit = xyes ; then
-+ PAM_LIBS="$PAM_LIBS -laudit"
-+
-+$as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h
-+
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then
@@ -57243,24 +57484,24 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XFREE_XINERAMA 1
-_ACEOF
-+#
-+# Subst the extra libs
-+#
-+
-+
-+
-
+
++if test x$have_libaudit = xyes ; then
++ PAM_LIBS="$PAM_LIBS -laudit"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XINERAMA 1
-_ACEOF
++$as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h
- XINERAMA_LIBS="-lXinerama"
- XINERAMA_SUPPORT=yes
-else
- use_xfree_xinerama=no
--fi
-
+ fi
+
++#
++# Subst the extra libs
++#
-else
- use_xfree_xinerama=no
@@ -57278,6 +57519,13 @@
- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo in -lXext" >&5
-$as_echo_n "checking for XineramaGetInfo in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XineramaGetInfo+set}" = set; then
++
++
++
++
++
++
++
+# Check for Solaris logindevperm support
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for di_devperm_login in -ldevinfo" >&5
@@ -57297,7 +57545,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -34320,3542 +22869,3192 @@
+@@ -34320,3542 +23017,3194 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57401,11 +57649,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_xinerama_h=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_header_X11_extensions_xinerama_h=no
++
+# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+# symlink to each other, and configure should use the more stable
+# location (the real directory) if possible.
@@ -57465,14 +57709,130 @@
+ X_SERVER_PATH="/usr/bin"
+ X_SERVER="/usr/bin/X"
+ X_CONFIG_OPTIONS="-audit 0"
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ # what to do, what to do, this is wrong, but this just sets the
+ # defaults, perhaps this user is cross compiling or some such
+ X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+ X_SERVER_PATH="/usr/X11R6/bin"
+ X_SERVER="/usr/X11R6/bin/X"
+ X_CONFIG_OPTIONS="-audit 0"
- fi
++fi
++
++
++# Use the wrapper script for the nested X server
++X_XNEST_CMD=/usr/share/gdm/gdmXnestWrapper
++X_XNEST_CONFIG_OPTIONS="-audit 0"
++X_XNEST_UNSCALED_FONTPATH="true"
++
++
++
++ EXP_VAR=LOCALSTATEDIR
++ FROM_VAR=$localstatedir
++
++ prefix_save=$prefix
++ exec_prefix_save=$exec_prefix
++
++ if test "x$prefix" = "xNONE"; then
++ prefix="$ac_default_prefix"
++ fi
++ if test "x$exec_prefix" = "xNONE"; then
++ exec_prefix=$prefix
++ fi
++
++ full_var="$FROM_VAR"
++ while true; do
++ new_full_var="`eval echo $full_var`"
++ if test "x$new_full_var" = "x$full_var"; then break; fi
++ full_var=$new_full_var
++ done
++
++ full_var=$new_full_var
++ LOCALSTATEDIR="$full_var"
++
++
++ prefix=$prefix_save
++ exec_prefix=$exec_prefix_save
++
++
++ EXP_VAR=SYSCONFDIR
++ FROM_VAR=$sysconfdir
++
++ prefix_save=$prefix
++ exec_prefix_save=$exec_prefix
++
++ if test "x$prefix" = "xNONE"; then
++ prefix="$ac_default_prefix"
++ fi
++ if test "x$exec_prefix" = "xNONE"; then
++ exec_prefix=$prefix
++ fi
++
++ full_var="$FROM_VAR"
++ while true; do
++ new_full_var="`eval echo $full_var`"
++ if test "x$new_full_var" = "x$full_var"; then break; fi
++ full_var=$new_full_var
++ done
++
++ full_var=$new_full_var
++ SYSCONFDIR="$full_var"
++
++
++ prefix=$prefix_save
++ exec_prefix=$exec_prefix_save
++
++
++ EXP_VAR=DATADIR
++ FROM_VAR=$datadir
++
++ prefix_save=$prefix
++ exec_prefix_save=$exec_prefix
++
++ if test "x$prefix" = "xNONE"; then
++ prefix="$ac_default_prefix"
++ fi
++ if test "x$exec_prefix" = "xNONE"; then
++ exec_prefix=$prefix
++ fi
++
++ full_var="$FROM_VAR"
++ while true; do
++ new_full_var="`eval echo $full_var`"
++ if test "x$new_full_var" = "x$full_var"; then break; fi
++ full_var=$new_full_var
++ done
++
++ full_var=$new_full_var
++ DATADIR="$full_var"
++
++
++ prefix=$prefix_save
++ exec_prefix=$exec_prefix_save
++
++
++ EXP_VAR=BINDIR
++ FROM_VAR=$bindir
++
++ prefix_save=$prefix
++ exec_prefix_save=$exec_prefix
++
++ if test "x$prefix" = "xNONE"; then
++ prefix="$ac_default_prefix"
++ fi
++ if test "x$exec_prefix" = "xNONE"; then
++ exec_prefix=$prefix
++ fi
+
+- ac_cv_header_X11_extensions_xinerama_h=no
+-fi
++ full_var="$FROM_VAR"
++ while true; do
++ new_full_var="`eval echo $full_var`"
++ if test "x$new_full_var" = "x$full_var"; then break; fi
++ full_var=$new_full_var
++ done
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
@@ -57482,15 +57842,15 @@
- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
- fi
++ full_var=$new_full_var
++ BINDIR="$full_var"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOLARIS_XINERAMA 1
-_ACEOF
-+# Use the wrapper script for the nested X server
-+X_XNEST_CMD=/usr/share/gdm/gdmXnestWrapper
-+X_XNEST_CONFIG_OPTIONS="-audit 0"
-+X_XNEST_UNSCALED_FONTPATH="true"
-
+
++ prefix=$prefix_save
++ exec_prefix=$exec_prefix_save
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XINERAMA 1
@@ -57501,8 +57861,8 @@
-else
- use_solaris_xinerama=no
-fi
-+ EXP_VAR=LOCALSTATEDIR
-+ FROM_VAR=$localstatedir
++ EXP_VAR=SBINDIR
++ FROM_VAR=$sbindir
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
@@ -57520,7 +57880,9 @@
+ exec_prefix=$prefix
fi
-fi
-
+-
+
+-CPPFLAGS="$xinerama_save_cppflags"
+ full_var="$FROM_VAR"
+ while true; do
+ new_full_var="`eval echo $full_var`"
@@ -57528,10 +57890,8 @@
+ full_var=$new_full_var
+ done
--CPPFLAGS="$xinerama_save_cppflags"
+ full_var=$new_full_var
-+ LOCALSTATEDIR="$full_var"
-
++ SBINDIR="$full_var"
-if test "x$with_selinux" = "xyes" ; then
- echo "SELinux support requested (--with-selinux was given), checking prerequisites"
@@ -57583,73 +57943,15 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_header_compiler=no
+-fi
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
-+
-+
-+ EXP_VAR=SYSCONFDIR
-+ FROM_VAR=$sysconfdir
-+
-+ prefix_save=$prefix
-+ exec_prefix_save=$exec_prefix
-+
-+ if test "x$prefix" = "xNONE"; then
-+ prefix="$ac_default_prefix"
-+ fi
-+ if test "x$exec_prefix" = "xNONE"; then
-+ exec_prefix=$prefix
-+ fi
-+
-+ full_var="$FROM_VAR"
-+ while true; do
-+ new_full_var="`eval echo $full_var`"
-+ if test "x$new_full_var" = "x$full_var"; then break; fi
-+ full_var=$new_full_var
-+ done
-+
-+ full_var=$new_full_var
-+ SYSCONFDIR="$full_var"
-+
-+
-+ prefix=$prefix_save
-+ exec_prefix=$exec_prefix_save
-+
-+
-+ EXP_VAR=DATADIR
-+ FROM_VAR=$datadir
-+
-+ prefix_save=$prefix
-+ exec_prefix_save=$exec_prefix
-+
-+ if test "x$prefix" = "xNONE"; then
-+ prefix="$ac_default_prefix"
-+ fi
-+ if test "x$exec_prefix" = "xNONE"; then
-+ exec_prefix=$prefix
-+ fi
-+
-+ full_var="$FROM_VAR"
-+ while true; do
-+ new_full_var="`eval echo $full_var`"
-+ if test "x$new_full_var" = "x$full_var"; then break; fi
-+ full_var=$new_full_var
-+ done
-+
-+ full_var=$new_full_var
-+ DATADIR="$full_var"
-+
-+
-+ prefix=$prefix_save
-+ exec_prefix=$exec_prefix_save
-
-- 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; }
-+ EXP_VAR=BINDIR
-+ FROM_VAR=$bindir
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking selinux/selinux.h presence" >&5
@@ -57683,27 +57985,23 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ EXP_VAR=LIBDIR
++ FROM_VAR=$libdir
+
+- ac_header_preproc=no
+-fi
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
-- 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; }
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+ full_var="$FROM_VAR"
-+ while true; do
-+ new_full_var="`eval echo $full_var`"
-+ if test "x$new_full_var" = "x$full_var"; then break; fi
-+ full_var=$new_full_var
-+ done
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -57744,13 +58042,17 @@
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_selinux_selinux_h" >&5
-$as_echo "$ac_cv_header_selinux_selinux_h" >&6; }
++ full_var="$FROM_VAR"
++ while true; do
++ new_full_var="`eval echo $full_var`"
++ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
-+ BINDIR="$full_var"
++ done
-fi
-
-+ prefix=$prefix_save
-+ exec_prefix=$exec_prefix_save
++ full_var=$new_full_var
++ LIBDIR="$full_var"
+
- if test "${ac_cv_header_selinux_get_context_list_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for selinux/get_context_list.h" >&5
@@ -57795,17 +58097,17 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ prefix=$prefix_save
++ exec_prefix=$exec_prefix_save
- ac_header_compiler=no
-fi
-+ EXP_VAR=SBINDIR
-+ FROM_VAR=$sbindir
-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; }
-+ prefix_save=$prefix
-+ exec_prefix_save=$exec_prefix
++ EXP_VAR=LIBEXECDIR
++ FROM_VAR=$libexecdir
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking selinux/get_context_list.h presence" >&5
@@ -57839,6 +58141,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ prefix_save=$prefix
++ exec_prefix_save=$exec_prefix
+
+- ac_header_preproc=no
+-fi
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
@@ -57846,20 +58153,15 @@
+ exec_prefix=$prefix
+ fi
-- 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; }
+ full_var="$FROM_VAR"
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+ full_var=$new_full_var
-+ SBINDIR="$full_var"
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -57900,11 +58202,13 @@
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_selinux_get_context_list_h" >&5
-$as_echo "$ac_cv_header_selinux_get_context_list_h" >&6; }
++ full_var=$new_full_var
++ LIBEXECDIR="$full_var"
-fi
+
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
-
- { $as_echo "$as_me:$LINENO: checking for attr_get in -lattr" >&5
-$as_echo_n "checking for attr_get in -lattr... " >&6; }
@@ -57919,8 +58223,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ EXP_VAR=LIBDIR
-+ FROM_VAR=$libdir
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -57962,17 +58264,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ prefix_save=$prefix
-+ exec_prefix_save=$exec_prefix
- ac_cv_lib_attr_attr_get=no
-fi
-+ if test "x$prefix" = "xNONE"; then
-+ prefix="$ac_default_prefix"
-+ fi
-+ if test "x$exec_prefix" = "xNONE"; then
-+ exec_prefix=$prefix
-+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -57983,13 +58277,10 @@
-$as_echo "$ac_cv_lib_attr_attr_get" >&6; }
-if test "x$ac_cv_lib_attr_attr_get" = x""yes; then
- /bin/true
--fi
-+ full_var="$FROM_VAR"
-+ while true; do
-+ new_full_var="`eval echo $full_var`"
-+ if test "x$new_full_var" = "x$full_var"; then break; fi
-+ full_var=$new_full_var
-+ done
++# Check whether --with-pid-file was given.
++if test "${with_pid_file+set}" = set; then :
++ withval=$with_pid_file;
+ fi
- # I'm anal and I don't know which versions have which symbols,
- # so I check for all the ones we use
@@ -58006,8 +58297,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ full_var=$new_full_var
-+ LIBDIR="$full_var"
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -58046,38 +58335,15 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_selinux_get_ordered_context_list=yes
--else
++if ! test -z "$with_pid_file"; then
++ GDM_PID_FILE=$with_pid_file
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_lib_selinux_get_ordered_context_list=no
--fi
-+ prefix=$prefix_save
-+ exec_prefix=$exec_prefix_save
-+
-+
-+ EXP_VAR=LIBEXECDIR
-+ FROM_VAR=$libexecdir
-+
-+ prefix_save=$prefix
-+ exec_prefix_save=$exec_prefix
-+
-+ if test "x$prefix" = "xNONE"; then
-+ prefix="$ac_default_prefix"
-+ fi
-+ if test "x$exec_prefix" = "xNONE"; then
-+ exec_prefix=$prefix
-+ fi
-+
-+ full_var="$FROM_VAR"
-+ while true; do
-+ new_full_var="`eval echo $full_var`"
-+ if test "x$new_full_var" = "x$full_var"; then break; fi
-+ full_var=$new_full_var
-+ done
-+
-+ full_var=$new_full_var
-+ LIBEXECDIR="$full_var"
++ GDM_PID_FILE=/var/run/gdm.pid
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -58103,8 +58369,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ prefix=$prefix_save
-+ exec_prefix=$exec_prefix_save
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -58120,7 +58384,9 @@
- ;
- return 0;
-}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define GDM_PID_FILE "$GDM_PID_FILE"
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -58160,9 +58426,10 @@
-if test "x$ac_cv_lib_selinux_freecon" = x""yes; then
- /bin/true
+
-+# Check whether --with-pid-file was given.
-+if test "${with_pid_file+set}" = set; then :
-+ withval=$with_pid_file;
++
++# Check whether --with-working-directory was given.
++if test "${with_working_directory+set}" = set; then :
++ withval=$with_working_directory;
fi
- { $as_echo "$as_me:$LINENO: checking for freeconary in -lselinux" >&5
@@ -58216,14 +58483,14 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_selinux_freeconary=yes
-+if ! test -z "$with_pid_file"; then
-+ GDM_PID_FILE=$with_pid_file
++if ! test -z "$with_working_directory"; then
++ GDM_WORKING_DIR=$with_working_directory
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_selinux_freeconary=no
-+ GDM_PID_FILE=/var/run/gdm.pid
++ GDM_WORKING_DIR=${localstatedir}/lib/gdm
fi
-rm -rf conftest.dSYM
@@ -58265,9 +58532,7 @@
- ;
- return 0;
-}
-+cat >>confdefs.h <<_ACEOF
-+#define GDM_PID_FILE "$GDM_PID_FILE"
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -58295,33 +58560,17 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_selinux_setexeccon=no
-+
-+
-+
-+# Check whether --with-working-directory was given.
-+if test "${with_working_directory+set}" = set; then :
-+ withval=$with_working_directory;
- fi
+-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
-+
-+if ! test -z "$with_working_directory"; then
-+ GDM_WORKING_DIR=$with_working_directory
-+else
-+ GDM_WORKING_DIR=${localstatedir}/lib/gdm
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_setexeccon" >&5
-$as_echo "$ac_cv_lib_selinux_setexeccon" >&6; }
-if test "x$ac_cv_lib_selinux_setexeccon" = x""yes; then
- /bin/true
-+
-+
-+
-+
-+
+# Check whether --with-xauth-dir was given.
+if test "${with_xauth_dir+set}" = set; then :
+ withval=$with_xauth_dir;
@@ -58418,15 +58667,28 @@
-_ACEOF
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+
-+
-+
+-fi
+
+
+-use_console_kit=no
+-if test "x$with_console_kit" != "xno" ; then
+- use_console_kit=yes
+
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_CONSOLE_KIT 1
+-_ACEOF
+# Turn on the additional warnings last, so -Werror doesn't affect other tests.
-+
+
+-fi
+- if test x$use_console_kit = xyes; then
+- WITH_CONSOLE_KIT_TRUE=
+- WITH_CONSOLE_KIT_FALSE='#'
+# Check whether --enable-more-warnings was given.
+if test "${enable_more_warnings+set}" = set; then :
+ enableval=$enable_more_warnings; set_more_warnings="$enableval"
-+else
+ else
+- WITH_CONSOLE_KIT_TRUE='#'
+- WITH_CONSOLE_KIT_FALSE=
+
+ if test -d $srcdir/.git; then
+ set_more_warnings=yes
@@ -58436,9 +58698,6 @@
fi
--use_console_kit=no
--if test "x$with_console_kit" != "xno" ; then
-- use_console_kit=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5
+$as_echo_n "checking for more warnings... " >&6; }
+if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
@@ -58450,7 +58709,7 @@
+ -Wnested-externs -Wpointer-arith \
+ -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
+ $CFLAGS"
-+
+
+ for option in -Wno-strict-aliasing -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
@@ -58458,37 +58717,23 @@
+$as_echo_n "checking whether gcc understands $option... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+int
+main ()
+{
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CONSOLE_KIT 1
+-# Check whether --with-dbus-sys was given.
+-if test "${with_dbus_sys+set}" = set; then
+- withval=$with_dbus_sys;
+ ;
+ return 0;
+}
- _ACEOF
--
--fi
-- if test x$use_console_kit = xyes; then
-- WITH_CONSOLE_KIT_TRUE=
-- WITH_CONSOLE_KIT_FALSE='#'
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ has_option=yes
- else
-- WITH_CONSOLE_KIT_TRUE='#'
-- WITH_CONSOLE_KIT_FALSE=
++else
+ has_option=no
- fi
--
--
--
--
--
--# Check whether --with-dbus-sys was given.
--if test "${with_dbus_sys+set}" = set; then
-- withval=$with_dbus_sys;
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $has_option = no; then
+ CFLAGS="$SAVE_CFLAGS"
@@ -58651,10 +58896,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-fi
--
++cat >>confdefs.h <<_ACEOF
++#define X_SERVER_PATH "$X_SERVER_PATH"
++_ACEOF
+
-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; }
@@ -58670,7 +58918,7 @@
-/* end confdefs.h. */
-#include <$ac_header>
+cat >>confdefs.h <<_ACEOF
-+#define X_SERVER_PATH "$X_SERVER_PATH"
++#define X_CONFIG_OPTIONS "$X_CONFIG_OPTIONS"
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -58693,14 +58941,14 @@
-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: )
@@ -58749,37 +58997,21 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+cat >>confdefs.h <<_ACEOF
-+#define X_CONFIG_OPTIONS "$X_CONFIG_OPTIONS"
- _ACEOF
-
--fi
--
--done
--
-
-
--authdir=${localstatedir}/gdm
-
--gdmlocaledir=${gdmconfdir}
-
--pixmapdir=${datadir}/pixmaps
++
+cat >>confdefs.h <<_ACEOF
+#define X_XNEST_CMD "$X_XNEST_CMD"
-+_ACEOF
-
+ _ACEOF
+
+-fi
+cat >>confdefs.h <<_ACEOF
+#define X_XNEST_CONFIG_OPTIONS "$X_XNEST_CONFIG_OPTIONS"
+_ACEOF
+-done
+cat >>confdefs.h <<_ACEOF
+#define X_XNEST_UNSCALED_FONTPATH "$X_XNEST_UNSCALED_FONTPATH"
+_ACEOF
--# Check whether --with-log-dir was given.
--if test "${with_log_dir+set}" = set; then
-- withval=$with_log_dir;
--fi
+## Stuff for debian/changelog.in
+#if test -e "debian/changelog"; then
@@ -58793,16 +59025,12 @@
+#AC_SUBST(DEBIAN_DATESTAMP)
+#AC_SUBST(DEBIAN_DATE)
--if ! test -z "$with_log_dir"; then
-- GDM_LOG_DIR=$with_log_dir
--else
-- GDM_LOG_DIR=/var/log/gdm
--fi
--logdir=$GDM_LOG_DIR
-+ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/simple-greeter/Makefile gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile gui/user-switch-applet/Makefile utils/Makefile data/gdm.conf data/Makefile data/faces/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile"
-
-
--withval=""
+-authdir=${localstatedir}/gdm
++ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/gdmsetup/Makefile gui/simple-greeter/Makefile gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile gui/user-switch-applet/Makefile utils/Makefile data/gdm.conf data/gdm.policy data/Makefile data/faces/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile"
+
+-gdmlocaledir=${gdmconfdir}
+
+-pixmapdir=${datadir}/pixmaps
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
@@ -58817,10 +59045,6 @@
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
--# Check whether --with-at-bindir was given.
--if test "${with_at_bindir+set}" = set; then
-- withval=$with_at_bindir;
--fi
+_ACEOF
+# The following way of writing the cache mishandles newlines in values,
@@ -58845,10 +59069,9 @@
+ esac
+ done
--if test x$withval != x; then
-- AT_BINDIR="$withval"
--else
-- AT_BINDIR='${bindir}'
+-# Check whether --with-log-dir was given.
+-if test "${with_log_dir+set}" = set; then
+- withval=$with_log_dir;
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
@@ -58890,6 +59113,13 @@
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-if ! test -z "$with_log_dir"; then
+- GDM_LOG_DIR=$with_log_dir
+-else
+- GDM_LOG_DIR=/var/log/gdm
+-fi
+-logdir=$GDM_LOG_DIR
+-
+DEFS=-DHAVE_CONFIG_H
-withval=""
@@ -58906,20 +59136,20 @@
+done
+LIBOBJS=$ac_libobjs
--# Check whether --with-defaults_conf was given.
--if test "${with_defaults_conf+set}" = set; then
-- withval=$with_defaults_conf;
+-# Check whether --with-at-bindir was given.
+-if test "${with_at_bindir+set}" = set; then
+- withval=$with_at_bindir;
-fi
+LTLIBOBJS=$ac_ltlibobjs
-if test x$withval != x; then
-- GDM_DEFAULTS_CONF="$withval"
+- AT_BINDIR="$withval"
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
else
-- GDM_DEFAULTS_CONF='${datadir}/gdm/defaults.conf'
+- AT_BINDIR='${bindir}'
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
fi
@@ -58928,9 +59158,9 @@
-
-withval=""
-
--# Check whether --with-custom_conf was given.
--if test "${with_custom_conf+set}" = set; then
-- withval=$with_custom_conf;
+-# Check whether --with-defaults_conf was given.
+-if test "${with_defaults_conf+set}" = set; then
+- withval=$with_defaults_conf;
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -58938,27 +59168,54 @@
-
-
-if test x$withval != x; then
-- GDM_CUSTOM_CONF="$withval"
+- GDM_DEFAULTS_CONF="$withval"
-else
-- GDM_CUSTOM_CONF='${gdmconfdir}/custom.conf'
+- GDM_DEFAULTS_CONF='${datadir}/gdm/defaults.conf'
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-
-
+-
+-withval=""
+-
+-# Check whether --with-custom_conf was given.
+-if test "${with_custom_conf+set}" = set; then
+- withval=$with_custom_conf;
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-
+-
+-if test x$withval != x; then
+- GDM_CUSTOM_CONF="$withval"
+-else
+- GDM_CUSTOM_CONF='${gdmconfdir}/custom.conf'
++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+-
-GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
-
-
--
--
++ ac_config_commands="$ac_config_commands po/stamp-it"
+
+
-# Check whether --with-xevie was given.
-if test "${with_xevie+set}" = set; then
- withval=$with_xevie;
-else
- with_xevie=no
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
++ as_fn_error "conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-
@@ -58967,8 +59224,8 @@
- XEVIE_OPTION="+extension XEVIE"
-else
- XEVIE_OPTION=""
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
++ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-
@@ -59030,29 +59287,28 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- check_sun_audit=no
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++if test -z "${HAVE_LIBXKLAVIER_TRUE}" && test -z "${HAVE_LIBXKLAVIER_FALSE}"; then
++ as_fn_error "conditional \"HAVE_LIBXKLAVIER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test ${check_sun_audit} = yes
-then
-+ ac_config_commands="$ac_config_commands po/stamp-it"
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ADT 1
-_ACEOF
-
+-
- PAM_LIBS="$PAM_LIBS -lbsm"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-+if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
++if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
++ as_fn_error "conditional \"HAVE_CHECK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test x$check_sun_audit = xyes; then
@@ -59061,28 +59317,6 @@
-else
- HAVE_ADT_TRUE='#'
- HAVE_ADT_FALSE=
-+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--
--
--# Check for Linux auditing API
--#
--
--# Check whether --with-libaudit was given.
--if test "${with_libaudit+set}" = set; then
-- withval=$with_libaudit;
--else
-- with_libaudit=auto
-+if test -z "${HAVE_LIBXKLAVIER_TRUE}" && test -z "${HAVE_LIBXKLAVIER_FALSE}"; then
-+ as_fn_error "conditional \"HAVE_LIBXKLAVIER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
-+ as_fn_error "conditional \"HAVE_CHECK\" 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_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -59130,6 +59364,27 @@
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+-# Check for Linux auditing API
+-#
+-
+-# Check whether --with-libaudit was given.
+-if test "${with_libaudit+set}" = set; then
+- withval=$with_libaudit;
+-else
+- with_libaudit=auto
+-fi
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
+
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+
-# libaudit detection
-if test x$with_libaudit = xno ; then
- have_libaudit=no;
@@ -59139,7 +59394,16 @@
-$as_echo_n "checking for audit_log_user_message in -laudit... " >&6; }
-if test "${ac_cv_lib_audit_audit_log_user_message+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++ emulate sh
++ NULLCMD=:
++ # 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
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-laudit $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -59169,7 +59433,12 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ case `(set -o) 2>/dev/null` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -59189,19 +59458,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-
+-
- ac_cv_lib_audit_audit_log_user_message=no
--fi
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -59212,30 +59471,10 @@
-$as_echo "$ac_cv_lib_audit_audit_log_user_message" >&6; }
-if test "x$ac_cv_lib_audit_audit_log_user_message" = x""yes; then
- have_libaudit=yes
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+ emulate sh
-+ NULLCMD=:
-+ # 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
+-else
- have_libaudit=no
-+ case `(set -o) 2>/dev/null` in #(
-+ *posix*) :
-+ set -o posix ;; #(
-+ *) :
-+ ;;
-+esac
- fi
-
-fi
-- if test x$have_libaudit = xyes; then
-- HAVE_LIBAUDIT_TRUE=
-- HAVE_LIBAUDIT_FALSE='#'
+as_nl='
+'
+export as_nl
@@ -59252,9 +59491,7 @@
+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
-- HAVE_LIBAUDIT_TRUE='#'
-- HAVE_LIBAUDIT_FALSE=
++else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
@@ -59276,14 +59513,12 @@
+ as_echo='sh -c $as_echo_body as_echo'
fi
--
--if test x$have_libaudit = xyes ; then
-- PAM_LIBS="$PAM_LIBS -laudit"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBAUDIT 1
--_ACEOF
--
+- if test x$have_libaudit = xyes; then
+- HAVE_LIBAUDIT_TRUE=
+- HAVE_LIBAUDIT_FALSE='#'
+-else
+- HAVE_LIBAUDIT_TRUE='#'
+- HAVE_LIBAUDIT_FALSE=
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
@@ -59293,11 +59528,9 @@
+ }
fi
--#
--# Subst the extra libs
--#
--
-
+
+-if test x$have_libaudit = xyes ; then
+- PAM_LIBS="$PAM_LIBS -laudit"
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
@@ -59305,6 +59538,9 @@
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBAUDIT 1
+-_ACEOF
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
@@ -59327,8 +59563,14 @@
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
-+fi
-
+ fi
+
+-#
+-# Subst the extra libs
+-#
+-
+-
+-
+# 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
@@ -59412,12 +59654,6 @@
+ }
+fi # as_fn_append
--# Check for Solaris logindevperm support
--#
--{ $as_echo "$as_me:$LINENO: checking for di_devperm_login in -ldevinfo" >&5
--$as_echo_n "checking for di_devperm_login in -ldevinfo... " >&6; }
--if test "${ac_cv_lib_devinfo_di_devperm_login+set}" = set; then
-- $as_echo_n "(cached) " >&6
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -59428,6 +59664,23 @@
+ {
+ as_val=$(( $* ))
+ }'
++else
++ as_fn_arith ()
++ {
++ as_val=`expr "$@" || test $? -eq 1`
++ }
++fi # as_fn_arith
+
+
+-# Check for Solaris logindevperm support
+-#
+-{ $as_echo "$as_me:$LINENO: checking for di_devperm_login in -ldevinfo" >&5
+-$as_echo_n "checking for di_devperm_login in -ldevinfo... " >&6; }
+-if test "${ac_cv_lib_devinfo_di_devperm_login+set}" = set; then
+- $as_echo_n "(cached) " >&6
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
++ as_expr=expr
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldevinfo $LIBS"
@@ -59437,11 +59690,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ as_fn_arith ()
-+ {
-+ as_val=`expr "$@" || test $? -eq 1`
-+ }
-+fi # as_fn_arith
++ as_expr=false
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -59480,20 +59730,13 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_devinfo_di_devperm_login=yes
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++ as_basename=basename
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ as_expr=false
-+fi
-
+-
- ac_cv_lib_devinfo_di_devperm_login=no
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
+ as_basename=false
fi
@@ -59509,10 +59752,13 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_devperm_login" >&5
-$as_echo "$ac_cv_lib_devinfo_di_devperm_login" >&6; }
-if test "x$ac_cv_lib_devinfo_di_devperm_login" = x""yes; then
-
+-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOGINDEVPERM 1
-_ACEOF
+
+- PAM_LIBS="$PAM_LIBS -ldevinfo"
+-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
@@ -59532,14 +59778,13 @@
+ }
+ s/.*/./; q'`
-- PAM_LIBS="$PAM_LIBS -ldevinfo"
+# 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 #(((((
+-n*)
@@ -59552,40 +59797,6 @@
+*)
+ ECHO_N='-n';;
+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+ if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
-+ elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+ else
-+ as_ln_s='cp -p'
-+ fi
-+else
-+ as_ln_s='cp -p'
- fi
-+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 ()
-+{
-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
-# symlink to each other, and configure should use the more stable
@@ -59646,6 +59857,71 @@
- X_SERVER_PATH="/usr/bin"
- X_SERVER="/usr/bin/X"
- X_CONFIG_OPTIONS="-audit 0"
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
+ else
+- # what to do, what to do, this is wrong, but this just sets the
+- # defaults, perhaps this user is cross compiling or some such
+- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
++ rm -f conf$$.dir
++ mkdir conf$$.dir 2>/dev/null
+ fi
+-
+-
+-# Use Xephyr if it is available. It works better than Xnest since Xephyr
+-# supports the Xserver extensions, even if on a remote machine.
+-#
+-X_XNEST_UNSCALED_FONTPATH="true"
+-if test -x $X_SERVER_PATH/Xephyr; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xephyr"
+- X_XNEST_CONFIG_OPTIONS="-audit 0"
+-else
+- if test -x /usr/openwin/bin/Xnest; then
+- # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
+- # use this version.
+- #
+- X_XNEST_CMD="/usr/openwin/bin/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
+- X_XNEST_UNSCALED_FONTPATH="false"
+- else
+- if test -x $X_SERVER_PATH/Xnest; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
+- fi
+- fi
++if (echo >conf$$.file) 2>/dev/null; then
++ if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++ as_ln_s='cp -p'
++ elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
++ else
++ as_ln_s='cp -p'
++ fi
++else
++ as_ln_s='cp -p'
+ fi
++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 ()
++{
+
+- EXP_VAR=LOCALSTATEDIR
+- FROM_VAR=$localstatedir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -59684,44 +59960,23 @@
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
+
+- prefix_save=$prefix
+- exec_prefix_save=$exec_prefix
+
+- if test "x$prefix" = "xNONE"; then
+- prefix="$ac_default_prefix"
+- fi
+- if test "x$exec_prefix" = "xNONE"; then
+- exec_prefix=$prefix
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
- else
-- # what to do, what to do, this is wrong, but this just sets the
-- # defaults, perhaps this user is cross compiling or some such
-- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
-- X_SERVER_PATH="/usr/X11R6/bin"
-- X_SERVER="/usr/X11R6/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
++else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
- fi
-
--
--# Use Xephyr if it is available. It works better than Xnest since Xephyr
--# supports the Xserver extensions, even if on a remote machine.
--#
--X_XNEST_UNSCALED_FONTPATH="true"
--if test -x $X_SERVER_PATH/Xephyr; then
-- X_XNEST_CMD="$X_SERVER_PATH/Xephyr"
-- X_XNEST_CONFIG_OPTIONS="-audit 0"
--else
-- if test -x /usr/openwin/bin/Xnest; then
-- # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
-- # use this version.
-- #
-- X_XNEST_CMD="/usr/openwin/bin/Xnest"
-- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
-- X_XNEST_UNSCALED_FONTPATH="false"
-- else
-- if test -x $X_SERVER_PATH/Xnest; then
-- X_XNEST_CMD="$X_SERVER_PATH/Xnest"
-- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
-- fi
-- fi
++fi
++
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
@@ -59729,7 +59984,7 @@
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
-+ fi
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
@@ -59742,20 +59997,26 @@
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
- fi
++fi
+as_executable_p=$as_test_x
+- full_var="$FROM_VAR"
+- while true; do
+- new_full_var="`eval echo $full_var`"
+- if test "x$new_full_var" = "x$full_var"; then break; fi
+- full_var=$new_full_var
+- done
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+- full_var=$new_full_var
+- LOCALSTATEDIR="$full_var"
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-- EXP_VAR=LOCALSTATEDIR
-- FROM_VAR=$localstatedir
-
-- prefix_save=$prefix
-- exec_prefix_save=$exec_prefix
+
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
@@ -59763,12 +60024,6 @@
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-- if test "x$prefix" = "xNONE"; then
-- prefix="$ac_default_prefix"
-- fi
-- if test "x$exec_prefix" = "xNONE"; then
-- exec_prefix=$prefix
-- fi
+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
@@ -59777,47 +60032,65 @@
+This file was extended by gdm $as_me 2.30.0, which was
+generated by GNU Autoconf 2.65. Invocation command line was
+- EXP_VAR=SYSCONFDIR
+- FROM_VAR=$sysconfdir
++ CONFIG_FILES = $CONFIG_FILES
++ CONFIG_HEADERS = $CONFIG_HEADERS
++ CONFIG_LINKS = $CONFIG_LINKS
++ CONFIG_COMMANDS = $CONFIG_COMMANDS
++ $ $0 $@
+
+- prefix_save=$prefix
+- exec_prefix_save=$exec_prefix
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
+
+- if test "x$prefix" = "xNONE"; then
+- prefix="$ac_default_prefix"
+- fi
+- if test "x$exec_prefix" = "xNONE"; then
+- exec_prefix=$prefix
+- fi
++_ACEOF
+
- full_var="$FROM_VAR"
- while true; do
- new_full_var="`eval echo $full_var`"
- if test "x$new_full_var" = "x$full_var"; then break; fi
- full_var=$new_full_var
- done
-+ CONFIG_FILES = $CONFIG_FILES
-+ CONFIG_HEADERS = $CONFIG_HEADERS
-+ CONFIG_LINKS = $CONFIG_LINKS
-+ CONFIG_COMMANDS = $CONFIG_COMMANDS
-+ $ $0 $@
-
-- full_var=$new_full_var
-- LOCALSTATEDIR="$full_var"
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-
-+_ACEOF
-
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
-+
+
+- full_var=$new_full_var
+- SYSCONFDIR="$full_var"
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
-- EXP_VAR=SYSCONFDIR
-- FROM_VAR=$sysconfdir
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
++_ACEOF
+
+- EXP_VAR=DATADIR
+- FROM_VAR=$datadir
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++ac_cs_usage="\
++\`$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.
+
- prefix_save=$prefix
- exec_prefix_save=$exec_prefix
-+_ACEOF
++Usage: $0 [OPTION]... [TAG]...
- if test "x$prefix" = "xNONE"; then
- prefix="$ac_default_prefix"
@@ -59825,22 +60098,6 @@
- if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
- fi
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
-+\`$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.
-
-- full_var="$FROM_VAR"
-- while true; do
-- new_full_var="`eval echo $full_var`"
-- if test "x$new_full_var" = "x$full_var"; then break; fi
-- full_var=$new_full_var
-- done
-+Usage: $0 [OPTION]... [TAG]...
-
-- full_var=$new_full_var
-- SYSCONFDIR="$full_var"
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
@@ -59853,23 +60110,27 @@
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+- full_var="$FROM_VAR"
+- while true; do
+- new_full_var="`eval echo $full_var`"
+- if test "x$new_full_var" = "x$full_var"; then break; fi
+- full_var=$new_full_var
+- done
+Configuration files:
+$config_files
+- full_var=$new_full_var
+- DATADIR="$full_var"
++Configuration headers:
++$config_headers
+
++Configuration commands:
++$config_commands
+
- prefix=$prefix_save
- exec_prefix=$exec_prefix_save
-+Configuration headers:
-+$config_headers
-
-+Configuration commands:
-+$config_commands
-
-- EXP_VAR=DATADIR
-- FROM_VAR=$datadir
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gdm>."
-- prefix_save=$prefix
-- exec_prefix_save=$exec_prefix
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
@@ -59878,22 +60139,14 @@
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
-- if test "x$prefix" = "xNONE"; then
-- prefix="$ac_default_prefix"
-- fi
-- if test "x$exec_prefix" = "xNONE"; then
-- exec_prefix=$prefix
-- fi
+- EXP_VAR=BINDIR
+- FROM_VAR=$bindir
+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."
-- full_var="$FROM_VAR"
-- while true; do
-- new_full_var="`eval echo $full_var`"
-- if test "x$new_full_var" = "x$full_var"; then break; fi
-- full_var=$new_full_var
-- done
+- prefix_save=$prefix
+- exec_prefix_save=$exec_prefix
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
@@ -59902,8 +60155,12 @@
+test -n "\$AWK" || AWK=awk
+_ACEOF
-- full_var=$new_full_var
-- DATADIR="$full_var"
+- if test "x$prefix" = "xNONE"; then
+- prefix="$ac_default_prefix"
+- fi
+- if test "x$exec_prefix" = "xNONE"; then
+- exec_prefix=$prefix
+- fi
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
@@ -59922,6 +60179,12 @@
+ ;;
+ esac
+- full_var="$FROM_VAR"
+- while true; do
+- new_full_var="`eval echo $full_var`"
+- if test "x$new_full_var" = "x$full_var"; then break; fi
+- full_var=$new_full_var
+- done
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
@@ -59956,8 +60219,8 @@
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
+- full_var=$new_full_var
+- BINDIR="$full_var"
+ # This is an error.
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
@@ -59965,33 +60228,21 @@
+ *) as_fn_append ac_config_targets " $1"
+ ac_need_defaults=false ;;
-- EXP_VAR=BINDIR
-- FROM_VAR=$bindir
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+ esac
+ shift
+done
-
-- prefix_save=$prefix
-- exec_prefix_save=$exec_prefix
++
+ac_configure_extra_args=
-- if test "x$prefix" = "xNONE"; then
-- prefix="$ac_default_prefix"
-- fi
-- if test "x$exec_prefix" = "xNONE"; then
-- exec_prefix=$prefix
-- fi
+if $ac_cs_silent; then
+ exec 6>/dev/null
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
-- full_var="$FROM_VAR"
-- while true; do
-- new_full_var="`eval echo $full_var`"
-- if test "x$new_full_var" = "x$full_var"; then break; fi
-- full_var=$new_full_var
-- done
+- EXP_VAR=SBINDIR
+- FROM_VAR=$sbindir
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
@@ -60003,8 +60254,8 @@
+ exec "\$@"
+fi
-- full_var=$new_full_var
-- BINDIR="$full_var"
+- prefix_save=$prefix
+- exec_prefix_save=$exec_prefix
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
@@ -60016,6 +60267,12 @@
+ $as_echo "$ac_log"
+} >&5
+- if test "x$prefix" = "xNONE"; then
+- prefix="$ac_default_prefix"
+- fi
+- if test "x$exec_prefix" = "xNONE"; then
+- exec_prefix=$prefix
+- fi
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
@@ -60023,15 +60280,19 @@
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
-
+- full_var="$FROM_VAR"
+- while true; do
+- new_full_var="`eval echo $full_var`"
+- if test "x$new_full_var" = "x$full_var"; then break; fi
+- full_var=$new_full_var
+- done
+
+- full_var=$new_full_var
+- SBINDIR="$full_var"
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-- EXP_VAR=SBINDIR
-- FROM_VAR=$sbindir
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
@@ -60312,8 +60573,8 @@
+ esac
+done
-- prefix_save=$prefix
-- exec_prefix_save=$exec_prefix
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
@@ -60352,17 +60613,32 @@
+ esac
+done
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++ ;;
++esac
+
+- EXP_VAR=LIBDIR
+- FROM_VAR=$libdir
++ac_aux_dir='$ac_aux_dir'
++xsi_shell='$xsi_shell'
++lt_shell_append='$lt_shell_append'
+
+- prefix_save=$prefix
+- exec_prefix_save=$exec_prefix
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++fi
+
- if test "x$prefix" = "xNONE"; then
- prefix="$ac_default_prefix"
- fi
- if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
- fi
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-+ ;;
-+esac
- full_var="$FROM_VAR"
- while true; do
@@ -60370,30 +60646,22 @@
- if test "x$new_full_var" = "x$full_var"; then break; fi
- full_var=$new_full_var
- done
-+ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
-
-- full_var=$new_full_var
-- SBINDIR="$full_var"
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-
-
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'
-
-- EXP_VAR=LIBDIR
-- FROM_VAR=$libdir
+- full_var=$new_full_var
+- LIBDIR="$full_var"
+
+
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+
+
+- EXP_VAR=LIBEXECDIR
+- FROM_VAR=$libexecdir
- prefix_save=$prefix
- exec_prefix_save=$exec_prefix
@@ -60404,6 +60672,7 @@
- if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
- fi
++_ACEOF
- full_var="$FROM_VAR"
- while true; do
@@ -60411,16 +60680,10 @@
- if test "x$new_full_var" = "x$full_var"; then break; fi
- full_var=$new_full_var
- done
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- full_var=$new_full_var
-- LIBDIR="$full_var"
-
-+_ACEOF
-
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
+- LIBEXECDIR="$full_var"
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
@@ -60433,12 +60696,14 @@
+ "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+ "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
++ "gui/gdmsetup/Makefile") CONFIG_FILES="$CONFIG_FILES gui/gdmsetup/Makefile" ;;
+ "gui/simple-greeter/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-greeter/Makefile" ;;
+ "gui/simple-greeter/libnotificationarea/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-greeter/libnotificationarea/Makefile" ;;
+ "gui/simple-chooser/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-chooser/Makefile" ;;
+ "gui/user-switch-applet/Makefile") CONFIG_FILES="$CONFIG_FILES gui/user-switch-applet/Makefile" ;;
+ "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+ "data/gdm.conf") CONFIG_FILES="$CONFIG_FILES data/gdm.conf" ;;
++ "data/gdm.policy") CONFIG_FILES="$CONFIG_FILES data/gdm.policy" ;;
+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+ "data/faces/Makefile") CONFIG_FILES="$CONFIG_FILES data/faces/Makefile" ;;
+ "data/greeter-autostart/Makefile") CONFIG_FILES="$CONFIG_FILES data/greeter-autostart/Makefile" ;;
@@ -60452,21 +60717,13 @@
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-- EXP_VAR=LIBEXECDIR
-- FROM_VAR=$libexecdir
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+done
-- prefix_save=$prefix
-- exec_prefix_save=$exec_prefix
-
-- if test "x$prefix" = "xNONE"; then
-- prefix="$ac_default_prefix"
-- fi
-- if test "x$exec_prefix" = "xNONE"; then
-- exec_prefix=$prefix
-- fi
+- prefix=$prefix_save
+- exec_prefix=$exec_prefix_save
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
@@ -60477,12 +60734,6 @@
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
-- full_var="$FROM_VAR"
-- while true; do
-- new_full_var="`eval echo $full_var`"
-- if test "x$new_full_var" = "x$full_var"; then break; fi
-- full_var=$new_full_var
-- done
+# Have a temporary directory for convenience. Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
@@ -60499,8 +60750,6 @@
+}
+# Create a (secure) tmp directory for tmp files.
-- full_var=$new_full_var
-- LIBEXECDIR="$full_var"
+{
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
@@ -60510,14 +60759,18 @@
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+-# Check whether --with-pid-file was given.
+-if test "${with_pid_file+set}" = set; then
+- withval=$with_pid_file;
+-fi
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
-- prefix=$prefix_save
-- exec_prefix=$exec_prefix_save
-
+
+-if ! test -z "$with_pid_file"; then
+- GDM_PID_FILE=$with_pid_file
+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
@@ -60528,18 +60781,19 @@
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\r'
-+else
+ else
+- GDM_PID_FILE=/var/run/gdm.pid
+ ac_cs_awk_cr=$ac_cr
-+fi
-
+ fi
+
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GDM_PID_FILE "$GDM_PID_FILE"
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
-
-
--# Check whether --with-pid-file was given.
--if test "${with_pid_file+set}" = set; then
-- withval=$with_pid_file;
--fi
+ _ACEOF
+
+
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
@@ -60551,7 +60805,7 @@
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ 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
@@ -60563,11 +60817,6 @@
+done
+rm -f conf$$subs.sh
--if ! test -z "$with_pid_file"; then
-- GDM_PID_FILE=$with_pid_file
--else
-- GDM_PID_FILE=/var/run/gdm.pid
--fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
@@ -60621,6 +60870,10 @@
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+-# Check whether --with-working-directory was given.
+-if test "${with_working_directory+set}" = set; then
+- withval=$with_working_directory;
+-fi
+}
+{
+ line = $ 0
@@ -60642,22 +60895,10 @@
+ print line
+}
--cat >>confdefs.h <<_ACEOF
--#define GDM_PID_FILE "$GDM_PID_FILE"
-+_ACAWK
- _ACEOF
--
--
--
--
--# Check whether --with-working-directory was given.
--if test "${with_working_directory+set}" = set; then
-- withval=$with_working_directory;
--fi
--
--
-if ! test -z "$with_working_directory"; then
- GDM_WORKING_DIR=$with_working_directory
++_ACAWK
++_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
@@ -60731,16 +60972,10 @@
-if test "${with_screenshot_dir+set}" = set; then
- withval=$with_screenshot_dir;
-fi
--
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
--if ! test -z "$with_screenshot_dir"; then
-- GDM_SCREENSHOT_DIR=$with_screenshot_dir
--else
-- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
--fi
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
@@ -60781,6 +61016,11 @@
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+-if ! test -z "$with_screenshot_dir"; then
+- GDM_SCREENSHOT_DIR=$with_screenshot_dir
+-else
+- GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
+-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
@@ -60882,7 +61122,6 @@
+ *) ac_sed_conf_input=$configure_input;;
+ esac
--# Turn on the additional warnings last, so -Werror doesn't affect other tests.
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
@@ -60890,10 +61129,7 @@
+ ;;
+ esac
--# Check whether --enable-more-warnings was given.
--if test "${enable_more_warnings+set}" = set; then
-- enableval=$enable_more_warnings; set_more_warnings="$enableval"
--else
+-# Turn on the additional warnings last, so -Werror doesn't affect other tests.
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -60920,12 +61156,10 @@
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
-- if test -d $srcdir/.git; then
-- set_more_warnings=yes
-- else
-- set_more_warnings=no
-- fi
--fi
+-# Check whether --enable-more-warnings was given.
+-if test "${enable_more_warnings+set}" = set; then
+- enableval=$enable_more_warnings; set_more_warnings="$enableval"
+-else
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
@@ -60942,6 +61176,12 @@
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+- if test -d $srcdir/.git; then
+- set_more_warnings=yes
+- else
+- set_more_warnings=no
+- fi
+-fi
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
@@ -60958,6 +61198,7 @@
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
-{ $as_echo "$as_me:$LINENO: checking for more warnings" >&5
-$as_echo_n "checking for more warnings... " >&6; }
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
@@ -60969,6 +61210,11 @@
- -Wnested-externs -Wpointer-arith \
- -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
- $CFLAGS"
++ case $ac_mode in
++ :F)
++ #
++ # CONFIG_FILE
++ #
- for option in -Wno-strict-aliasing -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
@@ -60977,19 +61223,6 @@
-$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
--/* end confdefs.h. */
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
--int
--main ()
--{
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
@@ -60999,7 +61232,14 @@
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
- ;
- return 0;
@@ -63551,7 +63791,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -37878,15 +26077,12 @@
+@@ -37878,15 +26227,12 @@
done # for ac_tag
@@ -63569,7 +63809,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -37907,10 +26103,10 @@
+@@ -37907,10 +26253,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.
@@ -63780,7 +64020,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -270,8 +316,7 @@
+@@ -270,18 +316,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -63790,7 +64030,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -282,6 +327,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -63798,7 +64043,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -313,6 +359,7 @@
+@@ -313,6 +361,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -63806,7 +64051,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -322,6 +369,7 @@
+@@ -322,6 +371,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -63814,7 +64059,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -332,13 +380,19 @@
+@@ -332,13 +382,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -63834,7 +64079,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -352,6 +406,7 @@
+@@ -352,6 +408,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -63842,7 +64087,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -390,7 +445,7 @@
+@@ -390,7 +447,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -63851,7 +64096,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -426,6 +481,7 @@
+@@ -426,6 +483,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -63859,7 +64104,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -726,14 +782,14 @@
+@@ -726,14 +784,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -63879,7 +64124,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -751,109 +807,157 @@
+@@ -751,109 +809,157 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64101,7 +64346,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -907,22 +1011,25 @@
+@@ -907,22 +1013,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xdmcp-chooser-slave-main.Po at am__quote@
.c.o:
@@ -64133,7 +64378,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -938,45 +1045,49 @@
+@@ -938,45 +1047,49 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -64199,7 +64444,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -997,13 +1108,17 @@
+@@ -997,13 +1110,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -64221,7 +64466,7 @@
|| exit 1; \
fi; \
done
-@@ -1037,6 +1152,7 @@
+@@ -1037,6 +1154,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64229,7 +64474,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1059,6 +1175,8 @@
+@@ -1059,6 +1177,8 @@
html: html-am
@@ -64238,7 +64483,7 @@
info: info-am
info-am:
-@@ -1067,19 +1185,29 @@
+@@ -1067,19 +1187,29 @@
install-dvi: install-dvi-am
@@ -64268,7 +64513,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1103,7 +1231,7 @@
+@@ -1103,7 +1233,7 @@
uninstall-am: uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS \
uninstall-sbinSCRIPTS
@@ -64277,7 +64522,7 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \
-@@ -1156,6 +1284,7 @@
+@@ -1156,6 +1286,7 @@
gdm: $(srcdir)/gdm.in
sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
@@ -64377,7 +64622,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -113,8 +140,7 @@
+@@ -113,18 +140,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -64387,7 +64632,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -125,6 +151,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -64395,7 +64645,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -156,6 +183,7 @@
+@@ -156,6 +185,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -64403,7 +64653,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -165,6 +193,7 @@
+@@ -165,6 +195,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -64411,7 +64661,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -175,13 +204,19 @@
+@@ -175,13 +206,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -64431,7 +64681,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -195,6 +230,7 @@
+@@ -195,6 +232,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -64439,7 +64689,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -233,7 +269,7 @@
+@@ -233,7 +271,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -64448,7 +64698,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -269,6 +305,7 @@
+@@ -269,6 +307,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -64456,7 +64706,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -323,14 +360,14 @@
+@@ -323,14 +362,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -64476,7 +64726,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -348,6 +385,7 @@
+@@ -348,6 +387,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64484,7 +64734,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -357,20 +395,23 @@
+@@ -357,20 +397,23 @@
install-imageDATA: $(image_DATA)
@$(NORMAL_INSTALL)
test -z "$(imagedir)" || $(MKDIR_P) "$(DESTDIR)$(imagedir)"
@@ -64517,7 +64767,7 @@
tags: TAGS
TAGS:
-@@ -394,13 +435,17 @@
+@@ -394,13 +437,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -64539,7 +64789,7 @@
|| exit 1; \
fi; \
done
-@@ -431,6 +476,7 @@
+@@ -431,6 +478,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64547,7 +64797,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -449,6 +495,8 @@
+@@ -449,6 +497,8 @@
html: html-am
@@ -64556,7 +64806,7 @@
info: info-am
info-am:
-@@ -457,18 +505,28 @@
+@@ -457,18 +507,28 @@
install-dvi: install-dvi-am
@@ -64585,7 +64835,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -503,6 +561,7 @@
+@@ -503,6 +563,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-imageDATA
@@ -64685,7 +64935,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -114,8 +141,7 @@
+@@ -114,18 +141,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -64695,7 +64945,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -126,6 +152,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -64703,7 +64958,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -157,6 +184,7 @@
+@@ -157,6 +186,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -64711,7 +64966,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -166,6 +194,7 @@
+@@ -166,6 +196,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -64719,7 +64974,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -176,13 +205,19 @@
+@@ -176,13 +207,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -64739,7 +64994,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -196,6 +231,7 @@
+@@ -196,6 +233,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -64747,7 +65002,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -234,7 +270,7 @@
+@@ -234,7 +272,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -64756,7 +65011,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -270,6 +306,7 @@
+@@ -270,6 +308,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -64764,7 +65019,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -338,14 +375,14 @@
+@@ -338,14 +377,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -64784,7 +65039,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -363,6 +400,7 @@
+@@ -363,6 +402,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64792,7 +65047,7 @@
at-spi-registryd-wrapper.desktop.in: $(top_builddir)/config.status $(srcdir)/at-spi-registryd-wrapper.desktop.in.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -374,20 +412,23 @@
+@@ -374,20 +414,23 @@
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@@ -64825,7 +65080,7 @@
tags: TAGS
TAGS:
-@@ -411,13 +452,17 @@
+@@ -411,13 +454,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -64847,7 +65102,7 @@
|| exit 1; \
fi; \
done
-@@ -448,6 +493,7 @@
+@@ -448,6 +495,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64855,7 +65110,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -468,6 +514,8 @@
+@@ -468,6 +516,8 @@
html: html-am
@@ -64864,7 +65119,7 @@
info: info-am
info-am:
-@@ -476,18 +524,28 @@
+@@ -476,18 +526,28 @@
install-dvi: install-dvi-am
@@ -64893,7 +65148,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -527,6 +585,7 @@
+@@ -527,6 +587,7 @@
$(edit) $< >$@
@INTLTOOL_DESKTOP_RULE@
@@ -64926,8 +65181,12 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -37,13 +39,22 @@
- $(srcdir)/gdm.conf.in
+@@ -34,16 +36,25 @@
+ host_triplet = @host@
+ subdir = data
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(srcdir)/gdm.conf.in
++ $(srcdir)/gdm.conf.in $(srcdir)/gdm.policy.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/acinclude.m4 \
@@ -64940,7 +65199,8 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gdm.conf
+-CONFIG_CLEAN_FILES = gdm.conf
++CONFIG_CLEAN_FILES = gdm.conf gdm.policy
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -64951,7 +65211,7 @@
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -58,22 +69,63 @@
+@@ -58,22 +69,65 @@
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
@@ -64973,11 +65233,15 @@
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(dbusconfdir)" \
- "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"
+- "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"
-dbusconfDATA_INSTALL = $(INSTALL_DATA)
-localealiasDATA_INSTALL = $(INSTALL_DATA)
-schemasDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dbusconf_DATA) $(localealias_DATA) $(schemas_DATA)
+-DATA = $(dbusconf_DATA) $(localealias_DATA) $(schemas_DATA)
++ "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(polkitdir)" \
++ "$(DESTDIR)$(schemasdir)"
++DATA = $(dbusconf_DATA) $(localealias_DATA) $(polkit_DATA) \
++ $(schemas_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -65019,7 +65283,7 @@
APPLET_CFLAGS = @APPLET_CFLAGS@
APPLET_LIBS = @APPLET_LIBS@
AR = @AR@
-@@ -114,7 +166,8 @@
+@@ -114,7 +168,8 @@
DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -65029,7 +65293,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -129,8 +182,7 @@
+@@ -129,18 +184,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -65039,7 +65303,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -141,6 +193,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -65047,7 +65316,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -172,6 +225,7 @@
+@@ -172,6 +229,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -65055,7 +65324,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -181,6 +235,7 @@
+@@ -181,6 +239,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -65063,7 +65332,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -191,13 +246,19 @@
+@@ -191,13 +250,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -65083,7 +65352,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -211,6 +272,7 @@
+@@ -211,6 +276,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -65091,7 +65360,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -249,13 +311,13 @@
+@@ -249,13 +315,13 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -65107,7 +65376,7 @@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
-@@ -285,6 +347,7 @@
+@@ -285,6 +351,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -65115,7 +65384,33 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -367,14 +430,14 @@
+@@ -325,11 +392,15 @@
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ localealiasdir = $(datadir)/gdm
+ localealias_DATA = locale.alias
++polkitdir = $(datadir)/polkit-1/actions
++polkit_in_files = gdm.policy.in
++polkit_DATA = $(polkit_in_files:.policy.in=.policy)
+ EXTRA_DIST = \
+ $(schemas_in_files) \
+ $(schemas_DATA) \
+ $(dbusconf_in_files) \
+ $(localealias_DATA) \
++ $(polkit_in_files) \
+ gdm.schemas.in.in \
+ gdm.conf-custom.in \
+ Xsession.in \
+@@ -352,7 +423,8 @@
+ $(NULL)
+
+ DISTCLEANFILES = \
+- $(dbusconf_DATA) \
++ $(dbusconf_DATA) \
++ $(polkit_DATA) \
+ gdm.schemas \
+ $(NULL)
+
+@@ -367,14 +439,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -65135,15 +65430,19 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -392,6 +455,7 @@
+@@ -392,8 +464,11 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
gdm.conf: $(top_builddir)/config.status $(srcdir)/gdm.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-@@ -403,54 +467,63 @@
++gdm.policy: $(top_builddir)/config.status $(srcdir)/gdm.policy.in
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -403,54 +478,83 @@
install-dbusconfDATA: $(dbusconf_DATA)
@$(NORMAL_INSTALL)
test -z "$(dbusconfdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)"
@@ -65196,12 +65495,31 @@
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(localealiasdir)/$$f'"; \
- rm -f "$(DESTDIR)$(localealiasdir)/$$f"; \
-- done
+ @list='$(localealias_DATA)'; test -n "$(localealiasdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(localealiasdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(localealiasdir)" && rm -f $$files
++install-polkitDATA: $(polkit_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(polkitdir)" || $(MKDIR_P) "$(DESTDIR)$(polkitdir)"
++ @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkitdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(polkitdir)" || exit $$?; \
+ done
++
++uninstall-polkitDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(polkitdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(polkitdir)" && rm -f $$files
install-schemasDATA: $(schemas_DATA)
@$(NORMAL_INSTALL)
test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@@ -65234,7 +65552,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -459,7 +532,7 @@
+@@ -459,7 +563,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -65243,7 +65561,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -476,7 +549,7 @@
+@@ -476,7 +580,7 @@
else \
local_target="$$target"; \
fi; \
@@ -65252,7 +65570,7 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
-@@ -484,7 +557,7 @@
+@@ -484,7 +588,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -65261,7 +65579,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -510,16 +583,16 @@
+@@ -510,16 +614,16 @@
else \
local_target="$$target"; \
fi; \
@@ -65281,7 +65599,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -527,14 +600,14 @@
+@@ -527,14 +631,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -65299,7 +65617,7 @@
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
-@@ -546,39 +619,43 @@
+@@ -546,39 +650,43 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
@@ -65357,7 +65675,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -599,29 +676,44 @@
+@@ -599,29 +707,44 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -65412,7 +65730,16 @@
distdir) \
|| exit 1; \
fi; \
-@@ -655,6 +747,7 @@
+@@ -631,7 +754,7 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"; do \
++ for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(polkitdir)" "$(DESTDIR)$(schemasdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+@@ -655,6 +778,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -65420,7 +65747,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -675,6 +768,8 @@
+@@ -675,29 +799,40 @@
html: html-recursive
@@ -65429,8 +65756,10 @@
info: info-recursive
info-am:
-@@ -683,21 +778,30 @@
- install-schemasDATA
+
+ install-data-am: install-dbusconfDATA install-localealiasDATA \
+- install-schemasDATA
++ install-polkitDATA install-schemasDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
@@ -65461,8 +65790,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -720,9 +824,9 @@
- uninstall-schemasDATA
+@@ -717,12 +852,12 @@
+ ps-am:
+
+ uninstall-am: uninstall-dbusconfDATA uninstall-localealiasDATA \
+- uninstall-schemasDATA
++ uninstall-polkitDATA uninstall-schemasDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
@@ -65474,7 +65807,47 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
-@@ -913,6 +1017,7 @@
+@@ -733,13 +868,14 @@
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-localealiasDATA install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-schemasDATA install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am \
+- uninstall-dbusconfDATA uninstall-hook \
+- uninstall-localealiasDATA uninstall-schemasDATA
++ install-polkitDATA install-ps install-ps-am \
++ install-schemasDATA install-strip installcheck installcheck-am \
++ installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-dbusconfDATA uninstall-hook \
++ uninstall-localealiasDATA uninstall-polkitDATA \
++ uninstall-schemasDATA
+
+
+ Xsession: $(srcdir)/Xsession.in
+@@ -764,6 +900,8 @@
+
+ @INTLTOOL_SCHEMAS_RULE@
+
++ at INTLTOOL_POLICY_RULE@
++
+ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
+ sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
+ -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
+@@ -792,6 +930,8 @@
+ -e 's,[@]pixmapdir[@],$(pixmapdir),g' \
+ -e 's,[@]sbindir[@],$(sbindir),g' \
+ <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
++check:
++ $(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
+
+ uninstall-hook:
+ rm -f \
+@@ -913,6 +1053,7 @@
chown -R root:gdm $(DESTDIR)$(workingdir)/.gconf.mandatory || :
chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml
@@ -65574,7 +65947,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -115,8 +142,7 @@
+@@ -115,18 +142,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -65584,7 +65957,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -127,6 +153,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -65592,7 +65970,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +185,7 @@
+@@ -158,6 +187,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -65600,7 +65978,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +195,7 @@
+@@ -167,6 +197,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -65608,7 +65986,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +206,19 @@
+@@ -177,13 +208,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -65628,7 +66006,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +232,7 @@
+@@ -197,6 +234,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -65636,7 +66014,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +271,7 @@
+@@ -235,7 +273,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -65645,7 +66023,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -271,6 +307,7 @@
+@@ -271,6 +309,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -65653,7 +66031,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -307,14 +344,14 @@
+@@ -307,14 +346,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -65673,7 +66051,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -332,6 +369,7 @@
+@@ -332,6 +371,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65681,7 +66059,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -341,20 +379,23 @@
+@@ -341,20 +381,23 @@
install-appsiconDATA: $(appsicon_DATA)
@$(NORMAL_INSTALL)
test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -65714,7 +66092,7 @@
tags: TAGS
TAGS:
-@@ -378,13 +419,17 @@
+@@ -378,13 +421,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -65736,7 +66114,7 @@
|| exit 1; \
fi; \
done
-@@ -415,6 +460,7 @@
+@@ -415,6 +462,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -65744,7 +66122,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -434,6 +480,8 @@
+@@ -434,6 +482,8 @@
html: html-am
@@ -65753,7 +66131,7 @@
info: info-am
info-am:
-@@ -442,18 +490,28 @@
+@@ -442,18 +492,28 @@
install-dvi: install-dvi-am
@@ -65782,7 +66160,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -488,6 +546,7 @@
+@@ -488,6 +548,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-appsiconDATA
@@ -65882,7 +66260,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -115,8 +142,7 @@
+@@ -115,18 +142,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -65892,7 +66270,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -127,6 +153,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -65900,7 +66283,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +185,7 @@
+@@ -158,6 +187,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -65908,7 +66291,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +195,7 @@
+@@ -167,6 +197,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -65916,7 +66299,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +206,19 @@
+@@ -177,13 +208,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -65936,7 +66319,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +232,7 @@
+@@ -197,6 +234,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -65944,7 +66327,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +271,7 @@
+@@ -235,7 +273,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -65953,7 +66336,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -271,6 +307,7 @@
+@@ -271,6 +309,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -65961,7 +66344,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -308,14 +345,14 @@
+@@ -308,14 +347,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -65981,7 +66364,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -333,6 +370,7 @@
+@@ -333,6 +372,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65989,7 +66372,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -342,20 +380,23 @@
+@@ -342,20 +382,23 @@
install-appsiconDATA: $(appsicon_DATA)
@$(NORMAL_INSTALL)
test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -66022,7 +66405,7 @@
tags: TAGS
TAGS:
-@@ -379,13 +420,17 @@
+@@ -379,13 +422,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66044,7 +66427,7 @@
|| exit 1; \
fi; \
done
-@@ -416,6 +461,7 @@
+@@ -416,6 +463,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66052,7 +66435,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -435,6 +481,8 @@
+@@ -435,6 +483,8 @@
html: html-am
@@ -66061,7 +66444,7 @@
info: info-am
info-am:
-@@ -443,18 +491,28 @@
+@@ -443,18 +493,28 @@
install-dvi: install-dvi-am
@@ -66090,7 +66473,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -489,6 +547,7 @@
+@@ -489,6 +549,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-appsiconDATA
@@ -66190,7 +66573,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -115,8 +142,7 @@
+@@ -115,18 +142,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -66200,7 +66583,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -127,6 +153,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -66208,7 +66596,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +185,7 @@
+@@ -158,6 +187,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -66216,7 +66604,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +195,7 @@
+@@ -167,6 +197,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -66224,7 +66612,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +206,19 @@
+@@ -177,13 +208,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -66244,7 +66632,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +232,7 @@
+@@ -197,6 +234,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -66252,7 +66640,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +271,7 @@
+@@ -235,7 +273,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -66261,7 +66649,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -271,6 +307,7 @@
+@@ -271,6 +309,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -66269,7 +66657,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -309,14 +346,14 @@
+@@ -309,14 +348,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -66289,7 +66677,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -334,6 +371,7 @@
+@@ -334,6 +373,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66297,7 +66685,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -343,20 +381,23 @@
+@@ -343,20 +383,23 @@
install-appsiconDATA: $(appsicon_DATA)
@$(NORMAL_INSTALL)
test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -66330,7 +66718,7 @@
tags: TAGS
TAGS:
-@@ -380,13 +421,17 @@
+@@ -380,13 +423,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66352,7 +66740,7 @@
|| exit 1; \
fi; \
done
-@@ -417,6 +462,7 @@
+@@ -417,6 +464,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66360,7 +66748,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -436,6 +482,8 @@
+@@ -436,6 +484,8 @@
html: html-am
@@ -66369,7 +66757,7 @@
info: info-am
info-am:
-@@ -444,18 +492,28 @@
+@@ -444,18 +494,28 @@
install-dvi: install-dvi-am
@@ -66398,7 +66786,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -490,6 +548,7 @@
+@@ -490,6 +550,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-appsiconDATA
@@ -66531,7 +66919,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -125,8 +180,7 @@
+@@ -125,18 +180,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -66541,7 +66929,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -137,6 +191,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -66549,7 +66942,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -168,6 +223,7 @@
+@@ -168,6 +225,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -66557,7 +66950,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -177,6 +233,7 @@
+@@ -177,6 +235,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -66565,7 +66958,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -187,13 +244,19 @@
+@@ -187,13 +246,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -66585,7 +66978,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -207,6 +270,7 @@
+@@ -207,6 +272,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -66593,7 +66986,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -245,7 +309,7 @@
+@@ -245,7 +311,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -66602,7 +66995,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -281,6 +345,7 @@
+@@ -281,6 +347,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -66610,7 +67003,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -311,14 +376,14 @@
+@@ -311,14 +378,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -66630,7 +67023,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -336,6 +401,7 @@
+@@ -336,6 +403,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66638,7 +67031,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -345,20 +411,23 @@
+@@ -345,20 +413,23 @@
install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL)
test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
@@ -66671,7 +67064,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -367,7 +436,7 @@
+@@ -367,7 +438,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -66680,7 +67073,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -384,7 +453,7 @@
+@@ -384,7 +455,7 @@
else \
local_target="$$target"; \
fi; \
@@ -66689,7 +67082,7 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
-@@ -392,7 +461,7 @@
+@@ -392,7 +463,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -66698,7 +67091,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -418,16 +487,16 @@
+@@ -418,16 +489,16 @@
else \
local_target="$$target"; \
fi; \
@@ -66718,7 +67111,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -435,14 +504,14 @@
+@@ -435,14 +506,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -66736,7 +67129,7 @@
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
-@@ -454,39 +523,43 @@
+@@ -454,39 +525,43 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
@@ -66794,7 +67187,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -507,29 +580,44 @@
+@@ -507,29 +582,44 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66849,7 +67242,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -562,6 +650,7 @@
+@@ -562,6 +652,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66857,7 +67250,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -580,6 +669,8 @@
+@@ -580,6 +671,8 @@
html: html-recursive
@@ -66866,7 +67259,7 @@
info: info-recursive
info-am:
-@@ -588,18 +679,28 @@
+@@ -588,18 +681,28 @@
install-dvi: install-dvi-recursive
@@ -66895,7 +67288,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -620,8 +721,8 @@
+@@ -620,8 +723,8 @@
uninstall-am: uninstall-pixmapDATA
@@ -66906,7 +67299,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
-@@ -638,6 +739,7 @@
+@@ -638,6 +741,7 @@
tags tags-recursive uninstall uninstall-am \
uninstall-pixmapDATA
@@ -67236,7 +67629,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -128,8 +141,7 @@
+@@ -128,18 +141,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -67246,7 +67639,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -140,6 +152,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -67254,7 +67652,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -171,6 +184,7 @@
+@@ -171,6 +186,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -67262,7 +67660,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -180,6 +194,7 @@
+@@ -180,6 +196,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -67270,7 +67668,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -190,13 +205,19 @@
+@@ -190,13 +207,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -67290,7 +67688,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -210,6 +231,7 @@
+@@ -210,6 +233,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -67298,7 +67696,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -248,7 +270,7 @@
+@@ -248,7 +272,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -67307,7 +67705,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -284,6 +306,7 @@
+@@ -284,6 +308,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -67315,7 +67713,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -421,14 +444,14 @@
+@@ -421,14 +446,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -67335,7 +67733,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -446,6 +469,7 @@
+@@ -446,6 +471,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67343,7 +67741,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -475,13 +499,17 @@
+@@ -475,13 +501,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -67365,7 +67763,7 @@
|| exit 1; \
fi; \
done
-@@ -512,6 +540,7 @@
+@@ -512,6 +542,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -67373,7 +67771,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -530,6 +559,8 @@
+@@ -530,6 +561,8 @@
html: html-am
@@ -67382,7 +67780,7 @@
info: info-am
info-am:
-@@ -538,18 +569,28 @@
+@@ -538,18 +571,28 @@
install-dvi: install-dvi-am
@@ -67411,7 +67809,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -994,6 +1035,7 @@
+@@ -994,6 +1037,7 @@
#man_MANS = gdm.1
#EXTRA_DIST = gdm.1
@@ -67522,7 +67920,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -115,8 +156,7 @@
+@@ -115,18 +156,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -67532,7 +67930,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -127,6 +167,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -67540,7 +67943,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +199,7 @@
+@@ -158,6 +201,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -67548,7 +67951,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +209,7 @@
+@@ -167,6 +211,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -67556,7 +67959,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +220,19 @@
+@@ -177,13 +222,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -67576,7 +67979,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +246,7 @@
+@@ -197,6 +248,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -67584,7 +67987,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +285,7 @@
+@@ -235,7 +287,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -67593,7 +67996,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -271,6 +321,7 @@
+@@ -271,6 +323,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -67601,7 +68004,15 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -302,14 +353,14 @@
+@@ -293,6 +346,7 @@
+ simple-chooser \
+ simple-greeter \
+ user-switch-applet \
++ gdmsetup \
+ $(NULL)
+
+ all: all-recursive
+@@ -302,14 +356,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -67621,7 +68032,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -327,6 +378,7 @@
+@@ -327,6 +381,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67629,7 +68040,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -341,7 +393,7 @@
+@@ -341,7 +396,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -67638,7 +68049,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -358,7 +410,7 @@
+@@ -358,7 +413,7 @@
else \
local_target="$$target"; \
fi; \
@@ -67647,7 +68058,7 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
-@@ -366,7 +418,7 @@
+@@ -366,7 +421,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -67656,7 +68067,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -392,16 +444,16 @@
+@@ -392,16 +447,16 @@
else \
local_target="$$target"; \
fi; \
@@ -67676,7 +68087,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -409,14 +461,14 @@
+@@ -409,14 +464,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -67694,7 +68105,7 @@
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
-@@ -428,39 +480,43 @@
+@@ -428,39 +483,43 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
@@ -67752,7 +68163,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -481,29 +537,44 @@
+@@ -481,29 +540,44 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -67807,7 +68218,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -533,6 +604,7 @@
+@@ -533,6 +607,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -67815,7 +68226,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -551,6 +623,8 @@
+@@ -551,6 +626,8 @@
html: html-recursive
@@ -67824,7 +68235,7 @@
info: info-recursive
info-am:
-@@ -559,18 +633,28 @@
+@@ -559,18 +636,28 @@
install-dvi: install-dvi-recursive
@@ -67853,7 +68264,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -591,8 +675,8 @@
+@@ -591,8 +678,8 @@
uninstall-am:
@@ -67864,7 +68275,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
-@@ -608,6 +692,7 @@
+@@ -608,6 +695,7 @@
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
@@ -67987,7 +68398,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -146,8 +169,7 @@
+@@ -146,18 +169,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -67997,7 +68408,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -158,6 +180,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -68005,7 +68421,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -189,6 +212,7 @@
+@@ -189,6 +214,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -68013,7 +68429,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -198,6 +222,7 @@
+@@ -198,6 +224,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -68021,7 +68437,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -208,13 +233,19 @@
+@@ -208,13 +235,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -68041,7 +68457,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -228,6 +259,7 @@
+@@ -228,6 +261,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -68049,7 +68465,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -266,7 +298,7 @@
+@@ -266,7 +300,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -68058,7 +68474,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -302,6 +334,7 @@
+@@ -302,6 +336,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -68066,7 +68482,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -392,14 +425,14 @@
+@@ -392,14 +427,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -68086,7 +68502,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -417,40 +450,56 @@
+@@ -417,40 +452,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68165,7 +68581,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -467,22 +516,25 @@
+@@ -467,22 +518,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdm-host-chooser.Po at am__quote@
.c.o:
@@ -68197,7 +68613,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -498,45 +550,49 @@
+@@ -498,45 +552,49 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68263,7 +68679,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -557,13 +613,17 @@
+@@ -557,13 +615,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -68285,7 +68701,7 @@
|| exit 1; \
fi; \
done
-@@ -594,6 +654,7 @@
+@@ -594,6 +656,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -68293,7 +68709,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -615,6 +676,8 @@
+@@ -615,6 +678,8 @@
html: html-am
@@ -68302,7 +68718,7 @@
info: info-am
info-am:
-@@ -623,18 +686,28 @@
+@@ -623,18 +688,28 @@
install-dvi: install-dvi-am
@@ -68331,7 +68747,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -673,6 +746,7 @@
+@@ -673,6 +748,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-libexecPROGRAMS
@@ -68456,7 +68872,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -137,8 +162,7 @@
+@@ -137,18 +162,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -68466,7 +68882,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -149,6 +173,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -68474,7 +68895,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -180,6 +205,7 @@
+@@ -180,6 +207,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -68482,7 +68903,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -189,6 +215,7 @@
+@@ -189,6 +217,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -68490,7 +68911,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -199,13 +226,19 @@
+@@ -199,13 +228,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -68510,7 +68931,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -219,6 +252,7 @@
+@@ -219,6 +254,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -68518,7 +68939,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -257,7 +291,7 @@
+@@ -257,7 +293,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -68527,7 +68948,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -293,6 +327,7 @@
+@@ -293,6 +329,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -68535,7 +68956,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -381,14 +416,14 @@
+@@ -381,14 +418,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -68555,7 +68976,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -406,6 +441,7 @@
+@@ -406,6 +443,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68563,7 +68984,7 @@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -416,17 +452,19 @@
+@@ -416,17 +454,19 @@
rm -f "$${dir}/so_locations"; \
done
libnotificationarea.la: $(libnotificationarea_la_OBJECTS) $(libnotificationarea_la_DEPENDENCIES)
@@ -68590,7 +69011,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -443,22 +481,25 @@
+@@ -443,22 +483,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testtray.Po at am__quote@
.c.o:
@@ -68622,7 +69043,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -474,45 +515,49 @@
+@@ -474,45 +517,49 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -68688,7 +69109,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -533,13 +578,17 @@
+@@ -533,13 +580,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -68710,7 +69131,7 @@
|| exit 1; \
fi; \
done
-@@ -569,6 +618,7 @@
+@@ -569,6 +620,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -68718,7 +69139,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -591,6 +641,8 @@
+@@ -591,6 +643,8 @@
html: html-am
@@ -68727,7 +69148,7 @@
info: info-am
info-am:
-@@ -599,18 +651,28 @@
+@@ -599,18 +653,28 @@
install-dvi: install-dvi-am
@@ -68756,7 +69177,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -633,7 +695,7 @@
+@@ -633,7 +697,7 @@
uninstall-am:
@@ -68765,7 +69186,7 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-@@ -656,6 +718,7 @@
+@@ -656,6 +720,7 @@
na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"na-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
@@ -68949,7 +69370,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -284,8 +348,7 @@
+@@ -284,18 +348,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -68959,7 +69380,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -296,6 +359,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -68967,7 +69393,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -327,6 +391,7 @@
+@@ -327,6 +393,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -68975,7 +69401,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -336,6 +401,7 @@
+@@ -336,6 +403,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -68983,7 +69409,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -346,13 +412,19 @@
+@@ -346,13 +414,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -69003,7 +69429,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -366,6 +438,7 @@
+@@ -366,6 +440,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -69011,7 +69437,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -404,7 +477,7 @@
+@@ -404,7 +479,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -69020,7 +69446,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -440,6 +513,7 @@
+@@ -440,6 +515,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -69028,7 +69454,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -797,14 +871,14 @@
+@@ -797,14 +873,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -69048,7 +69474,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -822,6 +896,7 @@
+@@ -822,6 +898,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69056,7 +69482,7 @@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -832,75 +907,92 @@
+@@ -832,75 +909,92 @@
rm -f "$${dir}/so_locations"; \
done
libgdmuser.la: $(libgdmuser_la_OBJECTS) $(libgdmuser_la_DEPENDENCIES)
@@ -69186,7 +69612,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -947,39 +1039,44 @@
+@@ -947,39 +1041,44 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-user-manager.Po at am__quote@
.c.o:
@@ -69243,7 +69669,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -989,37 +1086,43 @@
+@@ -989,37 +1088,43 @@
install-schemasDATA: $(schemas_DATA)
@$(NORMAL_INSTALL)
test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@@ -69305,7 +69731,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -1028,7 +1131,7 @@
+@@ -1028,7 +1133,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -69314,7 +69740,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -1045,7 +1148,7 @@
+@@ -1045,7 +1150,7 @@
else \
local_target="$$target"; \
fi; \
@@ -69323,7 +69749,7 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
-@@ -1053,7 +1156,7 @@
+@@ -1053,7 +1158,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -69332,7 +69758,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -1079,16 +1182,16 @@
+@@ -1079,16 +1184,16 @@
else \
local_target="$$target"; \
fi; \
@@ -69352,7 +69778,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -1096,14 +1199,14 @@
+@@ -1096,14 +1201,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -69370,7 +69796,7 @@
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
-@@ -1115,39 +1218,43 @@
+@@ -1115,39 +1220,43 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
@@ -69428,7 +69854,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1168,29 +1275,44 @@
+@@ -1168,29 +1277,44 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -69483,7 +69909,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -1223,6 +1345,7 @@
+@@ -1223,6 +1347,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -69491,7 +69917,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -1246,6 +1369,8 @@
+@@ -1246,6 +1371,8 @@
html: html-recursive
@@ -69500,7 +69926,7 @@
info: info-recursive
info-am:
-@@ -1254,18 +1379,28 @@
+@@ -1254,18 +1381,28 @@
install-dvi: install-dvi-recursive
@@ -69529,7 +69955,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -1289,8 +1424,8 @@
+@@ -1289,8 +1426,8 @@
uninstall-am: uninstall-libexecPROGRAMS uninstall-schemasDATA \
uninstall-uiDATA
@@ -69540,7 +69966,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
-@@ -1322,6 +1457,7 @@
+@@ -1322,6 +1459,7 @@
@GCONF_SCHEMAS_INSTALL_TRUE@ done \
@GCONF_SCHEMAS_INSTALL_TRUE@ fi
@GCONF_SCHEMAS_INSTALL_FALSE at install-data-local:
@@ -69683,7 +70109,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -143,8 +179,7 @@
+@@ -143,18 +179,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -69693,7 +70119,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -155,6 +190,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -69701,7 +70132,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -186,6 +222,7 @@
+@@ -186,6 +224,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -69709,7 +70140,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -195,6 +232,7 @@
+@@ -195,6 +234,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -69717,7 +70148,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -205,13 +243,19 @@
+@@ -205,13 +245,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -69737,7 +70168,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -225,6 +269,7 @@
+@@ -225,6 +271,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -69745,7 +70176,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -263,7 +308,7 @@
+@@ -263,7 +310,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -69754,7 +70185,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -299,6 +344,7 @@
+@@ -299,6 +346,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -69762,7 +70193,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -384,14 +430,14 @@
+@@ -384,14 +432,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -69782,7 +70213,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -409,37 +455,53 @@
+@@ -409,37 +457,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69857,7 +70288,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -451,22 +513,25 @@
+@@ -451,22 +515,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdm-entry-menu-item.Po at am__quote@
.c.o:
@@ -69889,7 +70320,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -479,82 +544,92 @@
+@@ -479,82 +546,92 @@
install-serverDATA: $(server_DATA)
@$(NORMAL_INSTALL)
test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
@@ -70016,7 +70447,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -575,13 +650,17 @@
+@@ -575,13 +652,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -70038,7 +70469,7 @@
|| exit 1; \
fi; \
done
-@@ -612,6 +691,7 @@
+@@ -612,6 +693,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -70046,7 +70477,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -635,6 +715,8 @@
+@@ -635,6 +717,8 @@
html: html-am
@@ -70055,7 +70486,7 @@
info: info-am
info-am:
-@@ -643,18 +725,28 @@
+@@ -643,18 +727,28 @@
install-dvi: install-dvi-am
@@ -70084,7 +70515,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -701,6 +793,7 @@
+@@ -701,6 +795,7 @@
sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
@INTLTOOL_SERVER_RULE@
@@ -93031,7 +93462,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -130,8 +171,7 @@
+@@ -130,18 +171,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -93041,7 +93472,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -142,6 +182,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -93049,7 +93485,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -173,6 +214,7 @@
+@@ -173,6 +216,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -93057,7 +93493,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -182,6 +224,7 @@
+@@ -182,6 +226,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -93065,7 +93501,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -192,13 +235,19 @@
+@@ -192,13 +237,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -93085,7 +93521,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -212,6 +261,7 @@
+@@ -212,6 +263,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -93093,7 +93529,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -250,7 +300,7 @@
+@@ -250,7 +302,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -93102,7 +93538,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -286,6 +336,7 @@
+@@ -286,6 +338,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -93110,7 +93546,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -342,15 +393,15 @@
+@@ -342,15 +395,15 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -93131,7 +93567,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -366,9 +417,10 @@
+@@ -366,9 +419,10 @@
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
@@ -93144,7 +93580,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
-@@ -380,7 +432,7 @@
+@@ -380,7 +434,7 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
@@ -93153,7 +93589,7 @@
rm -f stamp-h1
touch $@
-@@ -394,7 +446,7 @@
+@@ -394,7 +448,7 @@
-rm -rf .libs _libs
distclean-libtool:
@@ -93162,7 +93598,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -403,7 +455,7 @@
+@@ -403,7 +457,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -93171,7 +93607,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -420,7 +472,7 @@
+@@ -420,7 +474,7 @@
else \
local_target="$$target"; \
fi; \
@@ -93180,7 +93616,7 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
-@@ -428,7 +480,7 @@
+@@ -428,7 +482,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -93189,7 +93625,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -454,16 +506,16 @@
+@@ -454,16 +508,16 @@
else \
local_target="$$target"; \
fi; \
@@ -93209,7 +93645,7 @@
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -471,14 +523,14 @@
+@@ -471,14 +525,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -93227,7 +93663,7 @@
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
-@@ -490,46 +542,50 @@
+@@ -490,46 +544,50 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
@@ -93293,7 +93729,7 @@
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -545,39 +601,55 @@
+@@ -545,39 +603,55 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -93361,7 +93797,7 @@
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-@@ -585,6 +657,14 @@
+@@ -585,6 +659,14 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -93376,7 +93812,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -608,13 +688,17 @@
+@@ -608,13 +690,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -93397,7 +93833,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
-@@ -622,9 +706,11 @@
+@@ -622,9 +708,11 @@
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -93410,7 +93846,7 @@
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
-@@ -646,13 +732,15 @@
+@@ -646,13 +734,15 @@
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
@@ -93428,7 +93864,7 @@
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
-@@ -694,6 +782,7 @@
+@@ -694,6 +784,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -93436,7 +93872,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -715,6 +804,8 @@
+@@ -715,6 +806,8 @@
html: html-recursive
@@ -93445,7 +93881,7 @@
info: info-recursive
info-am:
-@@ -723,18 +814,28 @@
+@@ -723,18 +816,28 @@
install-dvi: install-dvi-recursive
@@ -93474,7 +93910,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -757,24 +858,25 @@
+@@ -757,24 +860,25 @@
uninstall-am:
@@ -93804,7 +94240,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -135,8 +161,7 @@
+@@ -135,18 +161,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -93814,7 +94250,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -147,6 +172,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -93822,7 +94263,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -178,6 +204,7 @@
+@@ -178,6 +206,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -93830,7 +94271,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -187,6 +214,7 @@
+@@ -187,6 +216,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -93838,7 +94279,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -197,13 +225,19 @@
+@@ -197,13 +227,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -93858,7 +94299,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -217,6 +251,7 @@
+@@ -217,6 +253,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -93866,7 +94307,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -255,7 +290,7 @@
+@@ -255,7 +292,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -93875,7 +94316,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -291,6 +326,7 @@
+@@ -291,6 +328,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -93883,7 +94324,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -344,14 +380,14 @@
+@@ -344,14 +382,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -93903,7 +94344,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -369,16 +405,19 @@
+@@ -369,16 +407,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93929,7 +94370,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -391,64 +430,73 @@
+@@ -391,64 +432,73 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/m_common-s-common-utils.Po at am__quote@
.c.o:
@@ -94021,7 +94462,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='s-common-utils.c' object='m_common-s-common-utils.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m_common_CFLAGS) $(CFLAGS) -c -o m_common-s-common-utils.obj `if test -f 's-common-utils.c'; then $(CYGPATH_W) 's-common-utils.c'; else $(CYGPATH_W) '$(srcdir)/s-common-utils.c'; fi`
-@@ -464,53 +512,58 @@
+@@ -464,53 +514,58 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -94097,7 +94538,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -519,49 +572,63 @@
+@@ -519,49 +574,63 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -94173,7 +94614,7 @@
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -572,11 +639,15 @@
+@@ -572,11 +641,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -94191,7 +94632,7 @@
test "$$failed" -eq 0; \
else :; fi
-@@ -596,13 +667,17 @@
+@@ -596,13 +669,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -94213,7 +94654,7 @@
|| exit 1; \
fi; \
done
-@@ -631,6 +706,7 @@
+@@ -631,6 +708,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -94221,7 +94662,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,6 +728,8 @@
+@@ -652,6 +730,8 @@
html: html-am
@@ -94230,7 +94671,7 @@
info: info-am
info-am:
-@@ -660,18 +738,28 @@
+@@ -660,18 +740,28 @@
install-dvi: install-dvi-am
@@ -94259,7 +94700,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -694,7 +782,7 @@
+@@ -694,7 +784,7 @@
uninstall-am:
@@ -94268,7 +94709,7 @@
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-@@ -710,6 +798,7 @@
+@@ -710,6 +800,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
@@ -94411,7 +94852,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -138,8 +181,7 @@
+@@ -138,18 +181,20 @@
EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -94421,7 +94862,12 @@
GCONFTOOL = @GCONFTOOL@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
-@@ -150,6 +192,7 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
+ GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
GDM_GROUPNAME = @GDM_GROUPNAME@
GDM_OLD_CONF = @GDM_OLD_CONF@
@@ -94429,7 +94875,7 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -181,6 +224,7 @@
+@@ -181,6 +226,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -94437,7 +94883,7 @@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
-@@ -190,6 +234,7 @@
+@@ -190,6 +236,7 @@
LIBWRAP_LIBS = @LIBWRAP_LIBS@
LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -94445,7 +94891,7 @@
LN_S = @LN_S@
LOCALSTATEDIR = @LOCALSTATEDIR@
LTLIBOBJS = @LTLIBOBJS@
-@@ -200,13 +245,19 @@
+@@ -200,13 +247,19 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
@@ -94465,7 +94911,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PAM_PREFIX = @PAM_PREFIX@
-@@ -220,6 +271,7 @@
+@@ -220,6 +273,7 @@
RANLIB = @RANLIB@
RBAC_LIBS = @RBAC_LIBS@
SBINDIR = @SBINDIR@
@@ -94473,7 +94919,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -258,7 +310,7 @@
+@@ -258,7 +312,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -94482,7 +94928,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -294,6 +346,7 @@
+@@ -294,6 +348,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
@@ -94490,7 +94936,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -380,14 +433,14 @@
+@@ -380,14 +435,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -94510,7 +94956,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -405,59 +458,90 @@
+@@ -405,59 +460,90 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94635,7 +95081,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -469,22 +553,25 @@
+@@ -469,22 +555,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdmflexiserver.Po at am__quote@
.c.o:
@@ -94667,7 +95113,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -500,45 +587,49 @@
+@@ -500,45 +589,49 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -94733,7 +95179,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -559,13 +650,17 @@
+@@ -559,13 +652,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -94755,7 +95201,7 @@
|| exit 1; \
fi; \
done
-@@ -597,6 +692,7 @@
+@@ -597,6 +694,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -94763,7 +95209,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -618,6 +714,8 @@
+@@ -618,6 +716,8 @@
html: html-am
@@ -94772,7 +95218,7 @@
info: info-am
info-am:
-@@ -626,18 +724,28 @@
+@@ -626,18 +726,28 @@
install-dvi: install-dvi-am
@@ -94801,7 +95247,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -683,6 +791,7 @@
+@@ -683,6 +793,7 @@
$(edit) $< >$@
gdm-safe-restart: gdm-safe-restart.in Makefile
$(edit) $< >$@
@@ -94842,3 +95288,772 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+--- /dev/null
++++ b/gui/gdmsetup/Makefile.in
+@@ -0,0 +1,766 @@
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++bin_PROGRAMS = gdmsetup$(EXEEXT) $(am__EXEEXT_1)
++subdir = gui/gdmsetup
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++am__EXEEXT_1 =
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Systemdir)" \
++ "$(DESTDIR)$(uidir)"
++PROGRAMS = $(bin_PROGRAMS)
++am__objects_1 =
++am_gdmsetup_OBJECTS = gdmsetup.$(OBJEXT) $(am__objects_1)
++gdmsetup_OBJECTS = $(am_gdmsetup_OBJECTS)
++am__DEPENDENCIES_1 =
++gdmsetup_DEPENDENCIES = $(top_builddir)/common/libgdmcommon.la \
++ $(top_builddir)/gui/simple-greeter/libgdmuser.la \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++AM_V_lt = $(am__v_lt_$(V))
++am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
++am__v_lt_0 = --silent
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++am__mv = mv -f
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
++AM_V_CC = $(am__v_CC_$(V))
++am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
++am__v_CC_0 = @echo " CC " $@;
++AM_V_at = $(am__v_at_$(V))
++am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
++am__v_at_0 = @
++CCLD = $(CC)
++LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++AM_V_CCLD = $(am__v_CCLD_$(V))
++am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
++am__v_CCLD_0 = @echo " CCLD " $@;
++AM_V_GEN = $(am__v_GEN_$(V))
++am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
++am__v_GEN_0 = @echo " GEN " $@;
++SOURCES = $(gdmsetup_SOURCES)
++DIST_SOURCES = $(gdmsetup_SOURCES)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++DATA = $(System_DATA) $(ui_DATA)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AT_BINDIR = @AT_BINDIR@
++AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++BINDIR = @BINDIR@
++CANBERRA_GTK_CFLAGS = @CANBERRA_GTK_CFLAGS@
++CANBERRA_GTK_LIBS = @CANBERRA_GTK_LIBS@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CHECK_CFLAGS = @CHECK_CFLAGS@
++CHECK_LIBS = @CHECK_LIBS@
++COMMON_CFLAGS = @COMMON_CFLAGS@
++COMMON_LIBS = @COMMON_LIBS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DAEMON_CFLAGS = @DAEMON_CFLAGS@
++DAEMON_LIBS = @DAEMON_LIBS@
++DATADIR = @DATADIR@
++DATADIRNAME = @DATADIRNAME@
++DBUS_SYS_DIR = @DBUS_SYS_DIR@
++DEBUG_CFLAGS = @DEBUG_CFLAGS@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@
++EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@
++EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@
++EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@
++EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@
++EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
++EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
++EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
++EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_CFLAGS = @GCONF_CFLAGS@
++GCONF_LIBS = @GCONF_LIBS@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCHOOSER = @GDMCHOOSER@
++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@
++GDMSETUP_LIBS = @GDMSETUP_LIBS@
++GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@
++GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@
++GDM_GROUPNAME = @GDM_GROUPNAME@
++GDM_OLD_CONF = @GDM_OLD_CONF@
++GDM_PAM_DOMAIN = @GDM_PAM_DOMAIN@
++GDM_PID_FILE = @GDM_PID_FILE@
++GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
++GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
++GDM_USERNAME = @GDM_USERNAME@
++GDM_WORKING_DIR = @GDM_WORKING_DIR@
++GDM_XAUTH_DIR = @GDM_XAUTH_DIR@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GREP = @GREP@
++GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
++GTHREAD_LIBS = @GTHREAD_LIBS@
++GTK_CFLAGS = @GTK_CFLAGS@
++GTK_LIBS = @GTK_LIBS@
++HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
++HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
++HAVE_PAM = @HAVE_PAM@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBEXECDIR = @LIBEXECDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIBWRAP_LIBS = @LIBWRAP_LIBS@
++LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
++LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LOCALSTATEDIR = @LOCALSTATEDIR@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PAM_LIBS = @PAM_LIBS@
++PAM_PREFIX = @PAM_PREFIX@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++RANLIB = @RANLIB@
++RBAC_LIBS = @RBAC_LIBS@
++SBINDIR = @SBINDIR@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
++SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@
++SIMPLE_GREETER_CFLAGS = @SIMPLE_GREETER_CFLAGS@
++SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LIBS@
++SOUND_PROGRAM = @SOUND_PROGRAM@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@
++XDMCP_LIBS = @XDMCP_LIBS@
++XEVIE_OPTION = @XEVIE_OPTION@
++XGETTEXT = @XGETTEXT@
++XINERAMA_LIBS = @XINERAMA_LIBS@
++XLIB_CFLAGS = @XLIB_CFLAGS@
++XLIB_LIBS = @XLIB_LIBS@
++XMKMF = @XMKMF@
++XSESSION_SHELL = @XSESSION_SHELL@
++X_CFLAGS = @X_CFLAGS@
++X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PATH = @X_PATH@
++X_PRE_LIBS = @X_PRE_LIBS@
++X_SERVER = @X_SERVER@
++X_SERVER_PATH = @X_SERVER_PATH@
++X_XNEST_CMD = @X_XNEST_CMD@
++X_XNEST_CONFIG_OPTIONS = @X_XNEST_CONFIG_OPTIONS@
++X_XNEST_UNSCALED_FONTPATH = @X_XNEST_UNSCALED_FONTPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++authdir = @authdir@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++dmconfdir = @dmconfdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdmconfdir = @gdmconfdir@
++gdmlocaledir = @gdmlocaledir@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++logdir = @logdir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++pixmapdir = @pixmapdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++sysconfsubdir = @sysconfsubdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++NULL =
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/common \
++ -I$(top_srcdir)/gui/simple-greeter \
++ -DGDMCONFDIR=\"$(gdmconfdir)\" \
++ -DDMCONFDIR=\""$(dmconfdir)"\" \
++ -DDATADIR=\""$(datadir)"\" \
++ -DUIDIR=\""$(uidir)"\" \
++ -DGNOMELOCALEDIR=\""$(gdmlocaledir)"\" \
++ $(DISABLE_DEPRECATED_CFLAGS) \
++ $(GDMSETUP_CFLAGS) \
++ $(NULL)
++
++gdmsetup_SOURCES = \
++ gdmsetup.c \
++ $(NULL)
++
++gdmsetup_LDADD = \
++ $(top_builddir)/common/libgdmcommon.la \
++ $(top_builddir)/gui/simple-greeter/libgdmuser.la \
++ $(GDMSETUP_LIBS) \
++ $(NULL)
++
++uidir = $(pkgdatadir)
++ui_DATA = \
++ gdmsetup.ui \
++ $(NULL)
++
++Systemdir = $(datadir)/applications
++System_in_files = gdmsetup.desktop.in
++System_DATA = $(System_in_files:.desktop.in=.desktop)
++EXTRA_DIST = \
++ $(ui_DATA) \
++ $(System_in_files) \
++ $(NULL)
++
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gui/gdmsetup/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu gui/gdmsetup/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++install-binPROGRAMS: $(bin_PROGRAMS)
++ @$(NORMAL_INSTALL)
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed 's/$(EXEEXT)$$//' | \
++ while read p p1; do if test -f $$p || test -f $$p1; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
++ done | \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
++ sed 'N;N;N;s,\n, ,g' | \
++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
++ if ($$2 == $$4) files[d] = files[d] " " $$1; \
++ else { print "f", $$3 "/" $$4, $$1; } } \
++ END { for (d in files) print "f", d, files[d] }' | \
++ while read type dir files; do \
++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
++ test -z "$$files" || { \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
++ } \
++ ; done
++
++uninstall-binPROGRAMS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ files=`for p in $$list; do echo "$$p"; done | \
++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
++ -e 's/$$/$(EXEEXT)/' `; \
++ test -n "$$list" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(bindir)" && rm -f $$files
++
++clean-binPROGRAMS:
++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
++ echo " rm -f" $$list; \
++ rm -f $$list || exit $$?; \
++ test -n "$(EXEEXT)" || exit 0; \
++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f" $$list; \
++ rm -f $$list
++gdmsetup$(EXEEXT): $(gdmsetup_OBJECTS) $(gdmsetup_DEPENDENCIES)
++ @rm -f gdmsetup$(EXEEXT)
++ $(AM_V_CCLD)$(LINK) $(gdmsetup_OBJECTS) $(gdmsetup_LDADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT)
++
++distclean-compile:
++ -rm -f *.tab.c
++
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdmsetup.Po at am__quote@
++
++.c.o:
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
++
++.c.obj:
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++
++.c.lo:
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++install-SystemDATA: $(System_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(Systemdir)" || $(MKDIR_P) "$(DESTDIR)$(Systemdir)"
++ @list='$(System_DATA)'; test -n "$(Systemdir)" || list=; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Systemdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(Systemdir)" || exit $$?; \
++ done
++
++uninstall-SystemDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(System_DATA)'; test -n "$(Systemdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(Systemdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(Systemdir)" && rm -f $$files
++install-uiDATA: $(ui_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
++ done
++
++uninstall-uiDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(uidir)" && rm -f $$files
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++tags: TAGS
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ set x; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
++ fi
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ test -z "$(CTAGS_ARGS)$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ else \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(PROGRAMS) $(DATA)
++installdirs:
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Systemdir)" "$(DESTDIR)$(uidir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++ distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++html-am:
++
++info: info-am
++
++info-am:
++
++install-data-am: install-SystemDATA install-uiDATA
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
++
++install-exec-am: install-binPROGRAMS
++
++install-html: install-html-am
++
++install-html-am:
++
++install-info: install-info-am
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-SystemDATA uninstall-binPROGRAMS \
++ uninstall-uiDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++ clean-generic clean-libtool ctags distclean distclean-compile \
++ distclean-generic distclean-libtool distclean-tags distdir dvi \
++ dvi-am html html-am info info-am install install-SystemDATA \
++ install-am install-binPROGRAMS install-data install-data-am \
++ install-dvi install-dvi-am install-exec install-exec-am \
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip install-uiDATA installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-SystemDATA uninstall-am \
++ uninstall-binPROGRAMS uninstall-uiDATA
++
++ at INTLTOOL_DESKTOP_RULE@
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=23504&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Thu Apr 1 19:18:39 2010
@@ -9,4 +9,6 @@
09_default_session.patch
10_gdm3_pam.patch
11_xephyr_nested.patch
+12_polkit_settings.patch
+13_gdmsetup.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list