From 1f876171067c04fc21fccd5a3051f982fd85c0f0 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 21 Oct 2009 19:07:36 +0000 Subject: Updated to xorg-server-1.7.99.1 --- packages.txt | 2 +- xorg-server/COPYING | 21 - xorg-server/ChangeLog | 1232 +- xorg-server/Makefile.am | 5 + xorg-server/Makefile.in | 32 +- xorg-server/Xext/Makefile.am | 3 +- xorg-server/Xext/Makefile.in | 32 +- xorg-server/Xext/shm.c | 79 +- xorg-server/Xext/xselinux.c | 2070 - xorg-server/Xext/xselinux.h | 412 - xorg-server/Xext/xselinux_ext.c | 729 + xorg-server/Xext/xselinux_hooks.c | 1030 + xorg-server/Xext/xselinux_label.c | 381 + xorg-server/Xext/xselinuxint.h | 556 + xorg-server/Xext/xtest.c | 6 +- xorg-server/Xext/xvdisp.c | 2 +- xorg-server/Xi/Makefile.in | 15 +- xorg-server/Xi/queryst.c | 14 +- xorg-server/Xi/xiquerydevice.c | 41 +- xorg-server/Xi/xiquerydevice.h | 8 +- xorg-server/aclocal.m4 | 35 +- xorg-server/compile | 142 + xorg-server/composite/Makefile.in | 15 +- xorg-server/composite/compwindow.c | 4 +- xorg-server/config.guess | 58 +- xorg-server/config.sub | 15 +- xorg-server/config/Makefile.in | 15 +- xorg-server/configure | 39479 +++++++------------ xorg-server/configure.ac | 80 +- xorg-server/cpprules.in | 4 +- xorg-server/damageext/Makefile.in | 15 +- xorg-server/dbe/Makefile.in | 15 +- xorg-server/dix/Makefile.am | 6 +- xorg-server/dix/Makefile.in | 21 +- xorg-server/dix/devices.c | 5 +- xorg-server/dix/dixutils.c | 10 - xorg-server/dix/events.c | 27 +- xorg-server/dix/privates.c | 1 + xorg-server/doc/Makefile.in | 19 +- xorg-server/exa/Makefile.in | 15 +- xorg-server/exa/exa.c | 14 +- xorg-server/exa/exa_glyphs.c | 89 +- xorg-server/exa/exa_migration_mixed.c | 20 +- xorg-server/exa/exa_mixed.c | 3 + xorg-server/exa/exa_priv.h | 1 + xorg-server/fb/Makefile.in | 15 +- xorg-server/glx/Makefile.in | 15 +- xorg-server/glx/glxcmds.c | 14 +- xorg-server/glx/glxdri2.c | 12 + xorg-server/glx/glxext.c | 8 +- xorg-server/glx/glxscreens.c | 15 +- xorg-server/glx/glxscreens.h | 11 + xorg-server/glx/glxserver.h | 3 + xorg-server/glx/indirect_texture_compression.c | 4 +- xorg-server/hw/Makefile.in | 15 +- xorg-server/hw/dmx/Makefile.in | 15 +- xorg-server/hw/dmx/config/Makefile.in | 15 +- xorg-server/hw/dmx/config/dmxconfig.c | 11 +- xorg-server/hw/dmx/config/dmxconfig.h | 7 +- xorg-server/hw/dmx/config/scanner.c | 30 +- xorg-server/hw/dmx/dmx-config.h | 2 +- xorg-server/hw/dmx/dmx.c | 2 +- xorg-server/hw/dmx/dmxcursor.c | 4 +- xorg-server/hw/dmx/dmxextension.c | 2 +- xorg-server/hw/dmx/dmxextension.h | 4 +- xorg-server/hw/dmx/dmxinit.c | 6 + xorg-server/hw/dmx/dmxinput.c | 2 +- xorg-server/hw/dmx/dmxinput.h | 2 +- xorg-server/hw/dmx/dmxstat.c | 6 +- xorg-server/hw/dmx/dmxsync.c | 4 +- xorg-server/hw/dmx/dmxwindow.c | 7 +- xorg-server/hw/dmx/doc/Makefile.am | 162 +- xorg-server/hw/dmx/doc/Makefile.in | 199 +- xorg-server/hw/dmx/doc/doxygen.conf | 43 +- xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html | 109 +- .../hw/dmx/doc/html/ChkNotMaskEv_8h-source.html | 60 - xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html | 93 +- .../hw/dmx/doc/html/ChkNotMaskEv_8h_source.html | 73 + xorg-server/hw/dmx/doc/html/annotated.html | 60 +- xorg-server/hw/dmx/doc/html/classes.html | 33 +- xorg-server/hw/dmx/doc/html/dmx_8h-source.html | 276 - xorg-server/hw/dmx/doc/html/dmx_8h.html | 837 +- xorg-server/hw/dmx/doc/html/dmx_8h_source.html | 327 + .../hw/dmx/doc/html/dmx__glxvisuals_8h-source.html | 85 - .../hw/dmx/doc/html/dmx__glxvisuals_8h_source.html | 94 + xorg-server/hw/dmx/doc/html/dmxarg_8c.html | 365 +- xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html | 69 - xorg-server/hw/dmx/doc/html/dmxarg_8h.html | 356 +- xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html | 82 + xorg-server/hw/dmx/doc/html/dmxbackend_8c.html | 1372 +- .../hw/dmx/doc/html/dmxbackend_8h-source.html | 75 - xorg-server/hw/dmx/doc/html/dmxbackend_8h.html | 541 +- .../hw/dmx/doc/html/dmxbackend_8h_source.html | 88 + xorg-server/hw/dmx/doc/html/dmxcb_8c.html | 272 +- xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html | 70 - xorg-server/hw/dmx/doc/html/dmxcb_8h.html | 299 +- xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html | 83 + .../hw/dmx/doc/html/dmxclient_8h-source.html | 168 - xorg-server/hw/dmx/doc/html/dmxclient_8h.html | 235 +- .../hw/dmx/doc/html/dmxclient_8h_source.html | 172 + xorg-server/hw/dmx/doc/html/dmxcmap_8c.html | 399 +- xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html | 86 - xorg-server/hw/dmx/doc/html/dmxcmap_8h.html | 610 +- xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html | 98 + xorg-server/hw/dmx/doc/html/dmxcommon_8c.html | 1284 +- .../hw/dmx/doc/html/dmxcommon_8h-source.html | 151 - xorg-server/hw/dmx/doc/html/dmxcommon_8h.html | 1152 +- .../hw/dmx/doc/html/dmxcommon_8h_source.html | 156 + xorg-server/hw/dmx/doc/html/dmxcompat_8c.html | 272 +- .../hw/dmx/doc/html/dmxcompat_8h-source.html | 61 - xorg-server/hw/dmx/doc/html/dmxcompat_8h.html | 82 +- .../hw/dmx/doc/html/dmxcompat_8h_source.html | 74 + xorg-server/hw/dmx/doc/html/dmxconfig_8c.html | 1125 +- .../hw/dmx/doc/html/dmxconfig_8h-source.html | 84 - xorg-server/hw/dmx/doc/html/dmxconfig_8h.html | 572 +- .../hw/dmx/doc/html/dmxconfig_8h_source.html | 94 + xorg-server/hw/dmx/doc/html/dmxconsole_8c.html | 1694 +- .../hw/dmx/doc/html/dmxconsole_8h-source.html | 79 - xorg-server/hw/dmx/doc/html/dmxconsole_8h.html | 699 +- .../hw/dmx/doc/html/dmxconsole_8h_source.html | 92 + xorg-server/hw/dmx/doc/html/dmxcursor_8c.html | 1693 +- .../hw/dmx/doc/html/dmxcursor_8h-source.html | 86 - xorg-server/hw/dmx/doc/html/dmxcursor_8h.html | 792 +- .../hw/dmx/doc/html/dmxcursor_8h_source.html | 102 + xorg-server/hw/dmx/doc/html/dmxdetach_8c.html | 87 +- xorg-server/hw/dmx/doc/html/dmxdpms_8c.html | 229 +- xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html | 62 - xorg-server/hw/dmx/doc/html/dmxdpms_8h.html | 171 +- xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html | 75 + xorg-server/hw/dmx/doc/html/dmxdummy_8c.html | 138 +- .../hw/dmx/doc/html/dmxdummy_8h-source.html | 63 - xorg-server/hw/dmx/doc/html/dmxdummy_8h.html | 136 +- .../hw/dmx/doc/html/dmxdummy_8h_source.html | 76 + xorg-server/hw/dmx/doc/html/dmxeq_8c.html | 269 - xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html | 61 - xorg-server/hw/dmx/doc/html/dmxeq_8h.html | 63 - xorg-server/hw/dmx/doc/html/dmxevents_8c.html | 1180 +- .../hw/dmx/doc/html/dmxevents_8h-source.html | 66 - xorg-server/hw/dmx/doc/html/dmxevents_8h.html | 296 +- .../hw/dmx/doc/html/dmxevents_8h_source.html | 79 + xorg-server/hw/dmx/doc/html/dmxext_8h-source.html | 197 - xorg-server/hw/dmx/doc/html/dmxext_8h.html | 926 - xorg-server/hw/dmx/doc/html/dmxextension_8c.html | 1076 +- .../hw/dmx/doc/html/dmxextension_8h-source.html | 131 - xorg-server/hw/dmx/doc/html/dmxextension_8h.html | 800 +- .../hw/dmx/doc/html/dmxextension_8h_source.html | 144 + xorg-server/hw/dmx/doc/html/dmxfont_8c.html | 578 +- xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html | 78 - xorg-server/hw/dmx/doc/html/dmxfont_8h.html | 455 +- xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html | 91 + xorg-server/hw/dmx/doc/html/dmxgc_8c.html | 688 +- xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html | 106 - xorg-server/hw/dmx/doc/html/dmxgc_8h.html | 859 +- xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html | 119 + xorg-server/hw/dmx/doc/html/dmxgcops_8c.html | 1812 +- .../hw/dmx/doc/html/dmxgcops_8h-source.html | 115 - xorg-server/hw/dmx/doc/html/dmxgcops_8h.html | 1706 +- .../hw/dmx/doc/html/dmxgcops_8h_source.html | 128 + xorg-server/hw/dmx/doc/html/dmxinit_8c.html | 1368 +- xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html | 70 - xorg-server/hw/dmx/doc/html/dmxinit_8h.html | 195 +- xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html | 83 + xorg-server/hw/dmx/doc/html/dmxinput_8c.html | 284 +- .../hw/dmx/doc/html/dmxinput_8h-source.html | 146 - xorg-server/hw/dmx/doc/html/dmxinput_8h.html | 959 +- .../hw/dmx/doc/html/dmxinput_8h_source.html | 157 + xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html | 1730 +- .../hw/dmx/doc/html/dmxinputinit_8h-source.html | 259 - xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html | 1294 +- .../hw/dmx/doc/html/dmxinputinit_8h_source.html | 269 + xorg-server/hw/dmx/doc/html/dmxlog_8c.html | 932 +- xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html | 91 - xorg-server/hw/dmx/doc/html/dmxlog_8h.html | 849 +- xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html | 102 + xorg-server/hw/dmx/doc/html/dmxmap_8c.html | 195 +- xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html | 62 - xorg-server/hw/dmx/doc/html/dmxmap_8h.html | 189 +- xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html | 75 + xorg-server/hw/dmx/doc/html/dmxmotion_8c.html | 253 +- .../hw/dmx/doc/html/dmxmotion_8h-source.html | 69 - xorg-server/hw/dmx/doc/html/dmxmotion_8h.html | 223 +- .../hw/dmx/doc/html/dmxmotion_8h_source.html | 82 + xorg-server/hw/dmx/doc/html/dmxparse_8c.html | 1404 +- .../hw/dmx/doc/html/dmxparse_8h-source.html | 303 - xorg-server/hw/dmx/doc/html/dmxparse_8h.html | 2493 +- .../hw/dmx/doc/html/dmxparse_8h_source.html | 316 + xorg-server/hw/dmx/doc/html/dmxpict_8c.html | 1909 +- xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html | 141 - xorg-server/hw/dmx/doc/html/dmxpict_8h.html | 1971 +- xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html | 156 + xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html | 355 +- .../hw/dmx/doc/html/dmxpixmap_8h-source.html | 83 - xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html | 508 +- .../hw/dmx/doc/html/dmxpixmap_8h_source.html | 97 + xorg-server/hw/dmx/doc/html/dmxprint_8c.html | 744 +- .../hw/dmx/doc/html/dmxprint_8h-source.html | 63 - xorg-server/hw/dmx/doc/html/dmxprint_8h.html | 140 +- .../hw/dmx/doc/html/dmxprint_8h_source.html | 76 + xorg-server/hw/dmx/doc/html/dmxprop_8c.html | 465 +- xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html | 66 - xorg-server/hw/dmx/doc/html/dmxprop_8h.html | 217 +- xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html | 79 + .../hw/dmx/doc/html/dmxproto_8h-source.html | 431 - xorg-server/hw/dmx/doc/html/dmxproto_8h.html | 89 - xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html | 720 +- .../hw/dmx/doc/html/dmxscrinit_8h-source.html | 70 - xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html | 244 +- .../hw/dmx/doc/html/dmxscrinit_8h_source.html | 83 + xorg-server/hw/dmx/doc/html/dmxshadow_8c.html | 89 +- .../hw/dmx/doc/html/dmxshadow_8h-source.html | 66 - xorg-server/hw/dmx/doc/html/dmxshadow_8h.html | 91 +- .../hw/dmx/doc/html/dmxshadow_8h_source.html | 79 + xorg-server/hw/dmx/doc/html/dmxsigio_8c.html | 503 +- .../hw/dmx/doc/html/dmxsigio_8h-source.html | 65 - xorg-server/hw/dmx/doc/html/dmxsigio_8h.html | 330 +- .../hw/dmx/doc/html/dmxsigio_8h_source.html | 78 + xorg-server/hw/dmx/doc/html/dmxstat_8c.html | 524 +- xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html | 74 - xorg-server/hw/dmx/doc/html/dmxstat_8h.html | 507 +- xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html | 87 + xorg-server/hw/dmx/doc/html/dmxsync_8c.html | 378 +- xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html | 63 - xorg-server/hw/dmx/doc/html/dmxsync_8h.html | 187 +- xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html | 76 + xorg-server/hw/dmx/doc/html/dmxvisual_8c.html | 195 +- .../hw/dmx/doc/html/dmxvisual_8h-source.html | 67 - xorg-server/hw/dmx/doc/html/dmxvisual_8h.html | 195 +- .../hw/dmx/doc/html/dmxvisual_8h_source.html | 80 + xorg-server/hw/dmx/doc/html/dmxwindow_8c.html | 1314 +- .../hw/dmx/doc/html/dmxwindow_8h-source.html | 165 - xorg-server/hw/dmx/doc/html/dmxwindow_8h.html | 1510 +- .../hw/dmx/doc/html/dmxwindow_8h_source.html | 170 + xorg-server/hw/dmx/doc/html/dmxxinput_8c.html | 486 +- xorg-server/hw/dmx/doc/html/files.html | 126 +- xorg-server/hw/dmx/doc/html/functions.html | 287 +- xorg-server/hw/dmx/doc/html/functions_vars.html | 287 +- xorg-server/hw/dmx/doc/html/globals.html | 590 +- xorg-server/hw/dmx/doc/html/globals_defs.html | 91 +- xorg-server/hw/dmx/doc/html/globals_enum.html | 79 +- xorg-server/hw/dmx/doc/html/globals_eval.html | 215 +- xorg-server/hw/dmx/doc/html/globals_func.html | 448 +- xorg-server/hw/dmx/doc/html/globals_type.html | 393 +- xorg-server/hw/dmx/doc/html/globals_vars.html | 626 +- xorg-server/hw/dmx/doc/html/index.html | 18 +- xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html | 894 - xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html | 1483 +- .../hw/dmx/doc/html/lnx-keyboard_8h-source.html | 83 - xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html | 600 +- .../hw/dmx/doc/html/lnx-keyboard_8h_source.html | 96 + xorg-server/hw/dmx/doc/html/lnx-ms_8c.html | 896 +- xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html | 75 - xorg-server/hw/dmx/doc/html/lnx-ms_8h.html | 466 +- xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html | 88 + xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html | 894 +- xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html | 75 - xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html | 466 +- xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html | 88 + xorg-server/hw/dmx/doc/html/main.html | 24 +- .../doc/html/programs_2Xserver_2Xext_2dmx_8c.html | 71 - .../hw/dmx/doc/html/structDMXConfigCmdStruct.html | 116 +- .../hw/dmx/doc/html/structDMXConfigListStruct.html | 68 +- .../dmx/doc/html/structDMXDesktopAttributes.html | 32 - .../doc/html/structDMXDesktopAttributesRec.html | 104 +- .../hw/dmx/doc/html/structDMXInputAttributes.html | 32 - .../dmx/doc/html/structDMXInputAttributesRec.html | 152 +- .../hw/dmx/doc/html/structDMXScreenAttributes.html | 32 - .../dmx/doc/html/structDMXScreenAttributesRec.html | 232 +- .../hw/dmx/doc/html/structDMXWindowAttributes.html | 32 - .../dmx/doc/html/structDMXWindowAttributesRec.html | 104 +- .../hw/dmx/doc/html/struct__DMXConfigComment.html | 88 +- .../hw/dmx/doc/html/struct__DMXConfigDisplay.html | 360 +- .../hw/dmx/doc/html/struct__DMXConfigEntry.html | 104 +- .../hw/dmx/doc/html/struct__DMXConfigFullDim.html | 72 +- .../hw/dmx/doc/html/struct__DMXConfigNumber.html | 104 +- .../hw/dmx/doc/html/struct__DMXConfigOption.html | 104 +- .../hw/dmx/doc/html/struct__DMXConfigPair.html | 152 +- .../hw/dmx/doc/html/struct__DMXConfigParam.html | 168 +- .../hw/dmx/doc/html/struct__DMXConfigPartDim.html | 72 +- .../hw/dmx/doc/html/struct__DMXConfigString.html | 120 +- .../hw/dmx/doc/html/struct__DMXConfigSub.html | 152 +- .../hw/dmx/doc/html/struct__DMXConfigToken.html | 88 +- .../hw/dmx/doc/html/struct__DMXConfigVirtual.html | 184 +- .../hw/dmx/doc/html/struct__DMXConfigWall.html | 184 +- .../hw/dmx/doc/html/struct__DMXEventMap.html | 112 +- .../hw/dmx/doc/html/struct__DMXInputInfo.html | 779 +- .../hw/dmx/doc/html/struct__DMXLocalInitInfo.html | 1185 +- .../hw/dmx/doc/html/struct__DMXLocalInputInfo.html | 1665 +- .../hw/dmx/doc/html/struct__DMXScreenInfo.html | 2712 +- .../hw/dmx/doc/html/struct__DMXStatAvg.html | 84 +- .../hw/dmx/doc/html/struct__DMXStatInfo.html | 116 +- xorg-server/hw/dmx/doc/html/struct__Event.html | 104 - .../hw/dmx/doc/html/struct__EventQueue.html | 224 - xorg-server/hw/dmx/doc/html/struct__dmxArg.html | 143 +- .../hw/dmx/doc/html/struct__dmxColormapPriv.html | 56 +- .../hw/dmx/doc/html/struct__dmxCursorPriv.html | 56 +- .../hw/dmx/doc/html/struct__dmxFontPriv.html | 72 +- xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html | 104 +- .../hw/dmx/doc/html/struct__dmxGlyphPriv.html | 77 +- .../hw/dmx/doc/html/struct__dmxPictPriv.html | 112 +- .../hw/dmx/doc/html/struct__dmxPixPriv.html | 72 +- .../hw/dmx/doc/html/struct__dmxWinPriv.html | 184 +- xorg-server/hw/dmx/doc/html/struct__myPrivate.html | 1286 +- .../hw/dmx/doc/html/structdmxGlxVisualPrivate.html | 72 +- .../hw/dmx/doc/html/structxDMXAddInputReply.html | 32 - .../hw/dmx/doc/html/structxDMXAddInputReq.html | 32 - .../hw/dmx/doc/html/structxDMXAddScreenReply.html | 32 - .../hw/dmx/doc/html/structxDMXAddScreenReq.html | 32 - .../structxDMXChangeDesktopAttributesReply.html | 32 - .../html/structxDMXChangeDesktopAttributesReq.html | 32 - .../structxDMXChangeScreensAttributesReply.html | 32 - .../html/structxDMXChangeScreensAttributesReq.html | 32 - .../html/structxDMXForceWindowCreationReply.html | 32 - .../doc/html/structxDMXForceWindowCreationReq.html | 32 - .../html/structxDMXGetDesktopAttributesReply.html | 32 - .../html/structxDMXGetDesktopAttributesReq.html | 32 - .../html/structxDMXGetInputAttributesReply.html | 32 - .../doc/html/structxDMXGetInputAttributesReq.html | 32 - .../dmx/doc/html/structxDMXGetInputCountReply.html | 32 - .../dmx/doc/html/structxDMXGetInputCountReq.html | 32 - .../html/structxDMXGetScreenAttributesReply.html | 32 - .../doc/html/structxDMXGetScreenAttributesReq.html | 32 - .../doc/html/structxDMXGetScreenCountReply.html | 32 - .../dmx/doc/html/structxDMXGetScreenCountReq.html | 32 - .../html/structxDMXGetWindowAttributesReply.html | 32 - .../doc/html/structxDMXGetWindowAttributesReq.html | 32 - .../dmx/doc/html/structxDMXQueryVersionReply.html | 32 - .../hw/dmx/doc/html/structxDMXQueryVersionReq.html | 32 - .../dmx/doc/html/structxDMXRemoveInputReply.html | 32 - .../hw/dmx/doc/html/structxDMXRemoveInputReq.html | 32 - .../dmx/doc/html/structxDMXRemoveScreenReply.html | 32 - .../hw/dmx/doc/html/structxDMXRemoveScreenReq.html | 32 - .../hw/dmx/doc/html/structxDMXSyncReply.html | 32 - xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html | 32 - xorg-server/hw/dmx/doc/html/tree.html | 382 +- xorg-server/hw/dmx/doc/html/usb-common_8c.html | 812 +- .../hw/dmx/doc/html/usb-common_8h-source.html | 74 - xorg-server/hw/dmx/doc/html/usb-common_8h.html | 298 +- .../hw/dmx/doc/html/usb-common_8h_source.html | 87 + xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html | 792 +- .../hw/dmx/doc/html/usb-keyboard_8h-source.html | 68 - xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html | 275 +- .../hw/dmx/doc/html/usb-keyboard_8h_source.html | 81 + xorg-server/hw/dmx/doc/html/usb-mouse_8c.html | 520 +- .../hw/dmx/doc/html/usb-mouse_8h-source.html | 68 - xorg-server/hw/dmx/doc/html/usb-mouse_8h.html | 250 +- .../hw/dmx/doc/html/usb-mouse_8h_source.html | 81 + xorg-server/hw/dmx/doc/html/usb-other_8c.html | 505 +- .../hw/dmx/doc/html/usb-other_8h-source.html | 68 - xorg-server/hw/dmx/doc/html/usb-other_8h.html | 250 +- .../hw/dmx/doc/html/usb-other_8h_source.html | 81 + .../hw/dmx/doc/html/usb-private_8h-source.html | 131 - xorg-server/hw/dmx/doc/html/usb-private_8h.html | 302 +- .../hw/dmx/doc/html/usb-private_8h_source.html | 144 + xorg-server/hw/dmx/examples/Makefile.in | 15 +- xorg-server/hw/dmx/glxProxy/Makefile.in | 15 +- xorg-server/hw/dmx/input/Makefile.in | 15 +- xorg-server/hw/dmx/input/dmxbackend.c | 2 +- xorg-server/hw/dmx/input/dmxcommon.c | 2 +- xorg-server/hw/dmx/input/dmxevents.c | 5 +- xorg-server/hw/dmx/input/dmxinputinit.c | 26 +- xorg-server/hw/dmx/input/usb-common.c | 4 +- xorg-server/hw/kdrive/Makefile.am | 7 +- xorg-server/hw/kdrive/Makefile.in | 19 +- xorg-server/hw/kdrive/ephyr/Makefile.in | 19 +- xorg-server/hw/kdrive/ephyr/ephyrinit.c | 7 + xorg-server/hw/kdrive/fake/Makefile.in | 15 +- xorg-server/hw/kdrive/fake/fakeinit.c | 7 + xorg-server/hw/kdrive/fbdev/Makefile.in | 15 +- xorg-server/hw/kdrive/linux/Makefile.am | 1 - xorg-server/hw/kdrive/linux/Makefile.in | 20 +- xorg-server/hw/kdrive/linux/bus.c | 6 +- xorg-server/hw/kdrive/linux/klinux.h | 32 - xorg-server/hw/kdrive/linux/linux.c | 105 - xorg-server/hw/kdrive/linux/tslib.c | 4 - xorg-server/hw/kdrive/sdl/Makefile.am | 19 - xorg-server/hw/kdrive/sdl/Makefile.in | 726 - xorg-server/hw/kdrive/sdl/sdl.c | 336 - xorg-server/hw/kdrive/src/Makefile.in | 15 +- xorg-server/hw/kdrive/src/kinput.c | 10 +- xorg-server/hw/vfb/Makefile.in | 19 +- xorg-server/hw/xfree86/Makefile.in | 19 +- xorg-server/hw/xfree86/common/Makefile.in | 15 +- xorg-server/hw/xfree86/common/xf86Configure.c | 2 +- xorg-server/hw/xfree86/ddc/Makefile.in | 15 +- xorg-server/hw/xfree86/dixmods/Makefile.in | 15 +- xorg-server/hw/xfree86/dixmods/extmod/Makefile.in | 15 +- xorg-server/hw/xfree86/doc/Makefile.in | 15 +- xorg-server/hw/xfree86/doc/devel/Makefile.in | 15 +- xorg-server/hw/xfree86/doc/man/Makefile.in | 19 +- xorg-server/hw/xfree86/doc/sgml/Makefile.am | 8 +- xorg-server/hw/xfree86/doc/sgml/Makefile.in | 23 +- xorg-server/hw/xfree86/dri/Makefile.in | 15 +- xorg-server/hw/xfree86/dri/dri.c | 8 +- xorg-server/hw/xfree86/dri2/Makefile.in | 15 +- xorg-server/hw/xfree86/exa/Makefile.in | 19 +- xorg-server/hw/xfree86/fbdevhw/Makefile.in | 19 +- xorg-server/hw/xfree86/i2c/Makefile.in | 15 +- xorg-server/hw/xfree86/int10/Makefile.in | 15 +- xorg-server/hw/xfree86/loader/Makefile.in | 15 +- xorg-server/hw/xfree86/loader/sdksyms.c | 4 - xorg-server/hw/xfree86/modes/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/bsd/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/bus/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/bus/linuxPci.c | 2 +- xorg-server/hw/xfree86/os-support/hurd/Makefile.in | 15 +- .../hw/xfree86/os-support/linux/Makefile.in | 15 +- .../hw/xfree86/os-support/linux/lnx_video.c | 2 +- xorg-server/hw/xfree86/os-support/misc/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/sco/Makefile.in | 15 +- .../hw/xfree86/os-support/solaris/Makefile.in | 15 +- xorg-server/hw/xfree86/os-support/sysv/Makefile.in | 15 +- xorg-server/hw/xfree86/parser/Makefile.in | 15 +- xorg-server/hw/xfree86/ramdac/Makefile.in | 15 +- xorg-server/hw/xfree86/shadowfb/Makefile.in | 15 +- xorg-server/hw/xfree86/utils/Makefile.in | 15 +- xorg-server/hw/xfree86/utils/cvt/Makefile.in | 19 +- xorg-server/hw/xfree86/utils/gtf/Makefile.in | 19 +- xorg-server/hw/xfree86/vbe/Makefile.in | 15 +- xorg-server/hw/xfree86/vgahw/Makefile.in | 15 +- xorg-server/hw/xfree86/x86emu/Makefile.in | 15 +- xorg-server/hw/xfree86/xaa/Makefile.in | 15 +- xorg-server/hw/xfree86/xf8_16bpp/Makefile.in | 15 +- xorg-server/hw/xnest/Makefile.in | 19 +- xorg-server/hw/xquartz/GL/Makefile.in | 15 +- xorg-server/hw/xquartz/Makefile.in | 15 +- xorg-server/hw/xquartz/X11Controller.m | 4 +- xorg-server/hw/xquartz/bundle/Makefile.in | 15 +- xorg-server/hw/xquartz/doc/Makefile.in | 19 +- xorg-server/hw/xquartz/mach-startup/Makefile.in | 15 +- xorg-server/hw/xquartz/mach-startup/bundle-main.c | 6 +- xorg-server/hw/xquartz/pbproxy/Makefile.in | 15 +- xorg-server/hw/xquartz/xpr/Makefile.in | 15 +- xorg-server/hw/xwin/Makefile.am | 1 - xorg-server/hw/xwin/Makefile.in | 20 +- xorg-server/hw/xwin/X-boxed.ico | Bin 12902 -> 0 bytes xorg-server/hw/xwin/XWin.rc | 1 - xorg-server/hw/xwin/winmouse.c | 7 +- xorg-server/hw/xwin/winmultiwindowicons.c | 53 +- xorg-server/hw/xwin/winmultiwindowwndproc.c | 18 +- xorg-server/hw/xwin/winprefslex.c | 30 +- xorg-server/hw/xwin/winresource.h | 1 - xorg-server/hw/xwin/winwndproc.c | 4 + xorg-server/include/Makefile.in | 15 +- xorg-server/include/dix.h | 9 +- xorg-server/include/do-not-use-config.h.in | 9 +- xorg-server/include/os.h | 4 + xorg-server/include/protocol-versions.h | 2 +- xorg-server/ltmain.sh | 33 +- xorg-server/m4/libtool.m4 | 32 +- xorg-server/m4/shave.m4 | 73 - xorg-server/mi/Makefile.in | 15 +- xorg-server/miext/Makefile.in | 15 +- xorg-server/miext/cw/Makefile.in | 15 +- xorg-server/miext/damage/Makefile.in | 15 +- xorg-server/miext/rootless/Makefile.in | 15 +- xorg-server/miext/shadow/Makefile.in | 15 +- xorg-server/os/Makefile.am | 4 +- xorg-server/os/Makefile.in | 19 +- xorg-server/os/backtrace.c | 6 +- xorg-server/randr/Makefile.in | 15 +- xorg-server/record/Makefile.in | 15 +- xorg-server/render/Makefile.in | 15 +- xorg-server/shave-libtool.in | 69 - xorg-server/shave.in | 86 - xorg-server/test/Makefile.in | 15 +- xorg-server/test/xi2/Makefile.in | 15 +- xorg-server/xfixes/Makefile.in | 15 +- xorg-server/xkb/Makefile.am | 3 +- xorg-server/xkb/Makefile.in | 19 +- xorg-server/xkb/ddxLoad.c | 2 - xorg-server/xkb/xkb.c | 2 +- xorg-server/xkb/xkbInit.c | 2 - xorg-server/xkb/xkbUtils.c | 4 +- 474 files changed, 71707 insertions(+), 67819 deletions(-) delete mode 100644 xorg-server/Xext/xselinux.c create mode 100644 xorg-server/Xext/xselinux_ext.c create mode 100644 xorg-server/Xext/xselinux_hooks.c create mode 100644 xorg-server/Xext/xselinux_label.c create mode 100644 xorg-server/Xext/xselinuxint.h create mode 100644 xorg-server/compile delete mode 100644 xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmx_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmx_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxclient_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxeq_8c.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxeq_8h.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxext_8h-source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxext_8h.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxproto_8h.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html delete mode 100644 xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html delete mode 100644 xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html delete mode 100644 xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html delete mode 100644 xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html delete mode 100644 xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html delete mode 100644 xorg-server/hw/dmx/doc/html/struct__Event.html delete mode 100644 xorg-server/hw/dmx/doc/html/struct__EventQueue.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html delete mode 100644 xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html delete mode 100644 xorg-server/hw/dmx/doc/html/usb-common_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/usb-common_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/usb-other_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/usb-other_8h_source.html delete mode 100644 xorg-server/hw/dmx/doc/html/usb-private_8h-source.html create mode 100644 xorg-server/hw/dmx/doc/html/usb-private_8h_source.html delete mode 100644 xorg-server/hw/kdrive/linux/klinux.h delete mode 100644 xorg-server/hw/kdrive/sdl/Makefile.am delete mode 100644 xorg-server/hw/kdrive/sdl/Makefile.in delete mode 100644 xorg-server/hw/kdrive/sdl/sdl.c delete mode 100644 xorg-server/hw/xwin/X-boxed.ico delete mode 100644 xorg-server/m4/shave.m4 delete mode 100644 xorg-server/shave-libtool.in delete mode 100644 xorg-server/shave.in diff --git a/packages.txt b/packages.txt index 1a108ae9e..334920565 100644 --- a/packages.txt +++ b/packages.txt @@ -72,7 +72,7 @@ xextproto-7.1.1 xineramaproto-1.2 xkbcomp-1.1.1 xkeyboard-config-1.7 -xorg-server-1.7.0.902 +xorg-server-1.7.99.1 xproto-7.0.16 xtrans-1.2.5 zlib-1.2.3 diff --git a/xorg-server/COPYING b/xorg-server/COPYING index 5dc8c1dfb..0878c7a76 100644 --- a/xorg-server/COPYING +++ b/xorg-server/COPYING @@ -1256,27 +1256,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright © 2004 PillowElephantBadgerBankPond - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of PillowElephantBadgerBankPond not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. PillowElephantBadgerBankPond makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL PillowElephantBadgerBankPond BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - - Copyright (c) 1998 Todd C. Miller Permission to use, copy, modify, and distribute this software for any diff --git a/xorg-server/ChangeLog b/xorg-server/ChangeLog index d3b898140..f768aed11 100644 --- a/xorg-server/ChangeLog +++ b/xorg-server/ChangeLog @@ -1,25 +1,191 @@ -commit 37b5f41ccea3473b830cc0c4afb5d609e47004cb +commit 26f4d8a2c12ff06c4beb06842cd8d9c0d9ddd4aa +Author: Keith Packard +Date: Thu Oct 22 01:04:42 2009 +0900 + + Make sure dmx docs are built for distribution. + + Ok, dmx docs are driving me slightly nuts. We probably shouldn't + include the built versions in the tarball, but we do, so this is an + attempt to make that work by having both the 'all' and 'dist' targets + depends on the doxygen output. + + Signed-off-by: Keith Packard + +commit 4114854893ff57a1be525ec099a4b33e5f9963b1 +Author: Keith Packard +Date: Thu Oct 22 00:17:37 2009 +0900 + + Don't attempt to build hw/kdrive/sdl/Makefile anymore + + With sdl removed, there's no way to build the sdl Makefile. + + Signed-off-by: Keith Packard + +commit 4d333c5121818754356853724333eadec2dcd18c +Author: Keith Packard +Date: Thu Oct 22 00:16:12 2009 +0900 + + Always check for doxygen so that distcheck gets dmx docs + + make distcheck wants the built dmx documentation so that users don't + have to install doxygen. This means that even if dmx isn't built, the + docs need to be so that the tarball can include them. + + Signed-off-by: Keith Packard + +commit 7e92bac5f769aca99bd20e21fe2811f0480b647b +Author: Keith Packard +Date: Thu Oct 22 00:00:35 2009 +0900 + + Make sure HAVE_DOXYGEN is defined when not building dmx + + The DMX docs are build using doxygen if present, so configure.ac + checks to see if that is available. However, when not building dmx + (the default), this conditional must still be defined to make automake + happy. + + Signed-off-by: Keith Packard + +commit 1228e2d052f0bb98175c55c194340773b5fedb40 +Merge: 08e7f62 52bc6d9 +Author: Keith Packard +Date: Wed Oct 21 22:46:53 2009 +0900 + + Merge remote branch 'whot/master' + +commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23 +Author: Keith Packard +Date: Wed Oct 21 16:46:55 2009 +0900 + + Fix 'distcheck' to use host xkb files but install to build dir + + 'make distcheck' needs to read xkb files and write out compiled + versions as a part of the 'make check' phase. This patch passes + suitable options to the configure stage of the distcheck process to + read xkb files from the system location and write them to the + distcheck _inst directory. + + Signed-off-by: Keith Packard + +commit 52bc6d944946e66ea2cc685feaeea40bb496ea83 Author: Peter Hutterer -Date: Mon Oct 19 11:48:05 2009 +1000 +Date: Fri Oct 16 11:03:09 2009 +1000 + + kdrive: Purge Xsdl + + From the original Xsdl commit: + "sdl x server so that we can x-on-x the fb stuff for ease of debugging. if + anyone uses this in production, a big scary monster will eat them. + hrm, perhaps i should make it have a --i-know-what-i'm-doing + param that it doens't start without, heh" + + That should be reason enough to not spend time maintaing it. Also, no more + elephants. + + Signed-off-by: Peter Hutterer + +commit f713f447a2110718dfc091380699362d76f0cd6c +Author: Lee Leahu +Date: Mon Oct 19 15:43:59 2009 -0500 + + dmxDestroyWindow() - must call the X's native DetroyWindow() + + Don't really know why this section was disabled, but without it, + certain pPicture resources do not get free'd until later in the + FreeClientResources() process after the screen has been free'd - + resulting in seg fault. + + With this patch, all resources normally free'd using vanilla X are + now also being freed correctly by Xdmx. + + https://bugs.freedesktop.org/show_bug.cgi?id=24576 + + Signed-off-by: Peter Hutterer - xserver 1.7.0.902 +commit 664a8e37fd83141974b772980f680b94e48b4f87 +Author: Lee Leahu +Date: Sat Oct 17 00:45:44 2009 -0500 + + dmx: when setting up device axis, use the correct counter number Signed-off-by: Peter Hutterer -commit 37f857eb4cd30c6499a2735f59ddec87d1b7de57 +commit 010d5e28655d619693632938e9e4325eef938295 Author: Peter Hutterer -Date: Mon Oct 19 11:50:56 2009 +1000 +Date: Fri Oct 16 10:01:13 2009 +1000 - Revert "Xming: Remove unused X-boxed icon resource" + dmx: remove doxygen-generated files. - Breaks make dist. - make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'. Stop. + These can be recreated by simply running 'doxygen doxygen.conf' in + hw/dmx/doc. Some of the files do not exist anymore, these have been removed. + Some other files have a different naming scheme. + Doxygen warnings about missing links fixed, two warnings remain: - This reverts commit 2969eaa88c4422fedf1b069e6fe055904b233db2. + /home/whot/xorg/xserver/hw/dmx/dmxwindow.c:142: Warning: explicit link + request to 'dmxConfigureRootWindow' could not be resolved + /home/whot/xorg/xserver/hw/dmx/dmxwindow.c:119: Warning: explicit link + request to 'dmxConfigureScreenWindow()' could not be resolved Signed-off-by: Peter Hutterer -commit 650ac84a0cf62c139fa6254fb7a44157d551e8e3 +commit ff3e171568c8b604fc5eacd5f7e9b7ee9417f172 +Author: Peter Hutterer +Date: Fri Oct 16 10:26:21 2009 +1000 + + xkb: don't conditionally include xkb-config.h. + + If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway. + + Signed-off-by: Peter Hutterer + +commit 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6 +Author: Peter Hutterer +Date: Fri Oct 16 08:24:37 2009 +1000 + + Use the default XKB settings for dmx and kdrive. + + Drop the dmx-specific defines, there's no reason to have separate ones + considering they're about as hardcoded as the default rules anyway. + + Signed-off-by: Peter Hutterer + +commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01 +Author: Peter Hutterer +Date: Thu Sep 24 11:25:28 2009 +1000 + + kdrive: silence tslib compiler warnings + + tslib.c: In function 'TslibInit': + tslib.c:157: warning: unused variable 'tsDev' + tslib.c:156: warning: unused variable 'inputent' + tslib.c:155: warning: unused variable 'inputdir' + tslib.c:154: warning: unused variable 'i' + tslib.c:154: warning: unused variable 'fd' + + Signed-off-by: Peter Hutterer + +commit 522ca8179ad2b2b935993f08c9382cd5ad1d8b2f +Author: Mikhail Gusarov +Date: Tue Oct 20 04:18:01 2009 +0700 + + Remove unused LinuxFindPci and LinuxGetPciCfg + + These two functions are not referenced from inside xserver. + Remove now-empty klinux.h too. + + Signed-off-by: Keith Packard + +commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5 +Author: Yaakov Selkowitz +Date: Mon Oct 19 13:07:26 2009 +1000 + + Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06 + + Signed-off-by: Yaakov Selkowitz + Signed-off-by: Peter Hutterer + Signed-off-by: Keith Packard + +commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1 Author: Alan Coopersmith Date: Fri Oct 16 22:29:26 2009 -0700 @@ -32,9 +198,8 @@ Date: Fri Oct 16 22:29:26 2009 -0700 Signed-off-by: Alan Coopersmith Signed-off-by: Keith Packard - (cherry picked from commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1) -commit a8bfbd81b8aaac31b87d15257273d82174912b37 +commit a32b2420d85f076282721afe005e85fff7d9837e Author: Peter Hutterer Date: Thu Oct 15 13:50:36 2009 +1000 @@ -43,9 +208,38 @@ Date: Thu Oct 15 13:50:36 2009 +1000 Signed-off-by: Peter Hutterer Acked-by: Yaakov Selkowitz Signed-off-by: Keith Packard - (cherry picked from commit a32b2420d85f076282721afe005e85fff7d9837e) -commit 64faf44f36b09780737c06781dadcf8fcbcaf836 +commit 7c31dd5db8b43c7796bf97a07e08213af5afd2ae +Author: Yaakov Selkowitz +Date: Thu Oct 15 04:24:25 2009 -0500 + + Remove CopyISOLatin1Lowered + + This function was moved verbatim into libXfont-1.4, and it is not used + by the server or any drivers. Exporting it in both places leads to + multiple definition linking errors on Cygwin, where we need to use a + static libXfont due to poor weak-symbol handling. + + Signed-off-by: Yaakov Selkowitz + Signed-off-by: Keith Packard + +commit 9bc4e88d84daf0f4faf0599b575675e74c75f4b8 +Author: Yaakov Selkowitz +Date: Thu Oct 15 01:53:43 2009 -0500 + + Define ddxBeforeReset stubs in platform-neutral DDXs + + XWin uses ddxBeforeReset, which is called in DIX. Other DDXs need to + define these in order to avoid an undefined symbol error at link time + when building alongside XWin. Xnest and Xvfb already provide empty stubs; + this does the same for Xdmx and the platform-neutral KDrive servers. + + Also add a prototype to avoid a warning in all DDXs. + + Signed-off-by: Yaakov Selkowitz + Signed-off-by: Keith Packard + +commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac Author: Yaakov Selkowitz Date: Thu Oct 15 01:53:42 2009 -0500 @@ -56,9 +250,8 @@ Date: Thu Oct 15 01:53:42 2009 -0500 Signed-off-by: Yaakov Selkowitz Signed-off-by: Keith Packard - (cherry picked from commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac) -commit 4b419c1651bbe7fbd3e87c3d71ba9fe642672ca2 +commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb Author: Yaakov Selkowitz Date: Thu Oct 15 01:53:41 2009 -0500 @@ -72,9 +265,8 @@ Date: Thu Oct 15 01:53:41 2009 -0500 Signed-off-by: Yaakov Selkowitz Signed-off-by: Keith Packard - (cherry picked from commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb) -commit 7d5282dd597eb9353ca7a7697604d81228254d4a +commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e Author: Yaakov Selkowitz Date: Thu Oct 15 01:53:40 2009 -0500 @@ -82,9 +274,124 @@ Date: Thu Oct 15 01:53:40 2009 -0500 Signed-off-by: Yaakov Selkowitz Signed-off-by: Keith Packard - (cherry picked from commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e) -commit 1b88e4eb2e605fd1d3adffaf38dc40be6a28970d +commit 264ce9e8360374b3a43442c8bdea08abde705446 +Author: Eamon Walsh +Date: Wed Oct 14 20:33:53 2009 -0400 + + xselinux: Use the now-exported IsPointerDevice() instead of a copy. + + Signed-off-by: Eamon Walsh + +commit 0ae1632be045bfbb288bb57190c830f94247460f +Author: Eamon Walsh +Date: Wed Oct 14 20:32:28 2009 -0400 + + dix: Export IsPointerDevice() and IsKeyboardDevice(). + + Makes the functions available to extmod for extensions to call. + + Signed-off-by: Eamon Walsh + +commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0 +Author: Eamon Walsh +Date: Tue Sep 22 13:31:49 2009 -0700 + + xselinux: switch from x_device to separate x_pointer and x_keyboard classes. + + This will allow separate controls over pointer and keyboard without having + to relabel the devices to separate types. + + Signed-off-by: Eamon Walsh + +commit 4be354c4c2da5168b302601b91bd80cfaca7e193 +Author: Eamon Walsh +Date: Tue Sep 22 13:18:44 2009 -0700 + + Remove some debug messages that trigger on XACE event delivery failure. + + It is normal for XACE to deny an event delivery, so these log messages + shouldn't trigger when that happens. Just drop them for now. + + Signed-off-by: Eamon Walsh + +commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53 +Author: Eamon Walsh +Date: Tue Sep 22 13:13:03 2009 -0700 + + xace: Relax permissions on XkbGetState from Read to Getattr. + + This request is used to get the current keyboard group and is called from + GTK. It does not return an actual keymap (aside from modifiers) so it + should be safe to relax the permission on it. However it does return + button state information which should be controlled through a separate + pointer Read check. + + Signed-off-by: Eamon Walsh + +commit 0ff28319906eeb3f236acd72201c416ce01f2c6e +Author: Eamon Walsh +Date: Tue Sep 15 19:41:04 2009 -0400 + + xselinux: Stop special-casing QueryPointer access checks. + + XACE has been changed to not return BadAccess on device read failures. + Thus, no need for this workaround code. + + Signed-off-by: Eamon Walsh + +commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97 +Author: Eamon Walsh +Date: Tue Sep 15 19:29:34 2009 -0400 + + xace: Fake return values on denials in input polling requests. + + Instead of returning BadAccess when "read" permission is denied + on a device, falsify the device state (buttons down, keys pressed). + This is nicer to applications, but may still have undesired side + effects. The long-term solution is not to use these requests in + event-driven code! + + Requests affected: QueryPointer, QueryKeymap, XiQueryDevice. + + Signed-off-by: Eamon Walsh + +commit 0493935691e925ae137af7636fa15befa76c8b45 +Author: Eamon Walsh +Date: Mon Aug 31 21:20:53 2009 -0400 + + xselinux: Factor out some dynamic array code into common helpers. + + Signed-off-by: Eamon Walsh + +commit ae8891ba0b63bfe6941a324e201d9ab7c645c0f3 +Author: Eamon Walsh +Date: Mon Aug 31 18:46:23 2009 -0400 + + xselinux: refactor extension code into smaller files. + + New files: + xselinux_ext.c: Extension init and request handlers. + xselinux_hooks.c: XACE hook functions and other callbacks. + xselinux_label.c: Object security-labeling code. + xselinuxint.h: Shared internal functions. + + Signed-off-by: Eamon Walsh + +commit 22b38f513c93c2f2aea5909878c3c9acae7d35c1 +Author: Jon TURNEY +Date: Sat Oct 3 12:44:50 2009 +0100 + + Cygwin/X: Avoid a potential null pointer dereference before input initialization + + Avoid a null pointer dereference if WM_MOUSEMOVE occurred before + the input device had been initialized (a timing sensitive bug + occassionally seen during initialization) + + Signed-off-by: Jon TURNEY + Reviewed-by: Colin Harrison + +commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a Author: Jon TURNEY Date: Tue Jul 21 02:23:21 2009 +0100 @@ -95,18 +402,24 @@ Date: Tue Jul 21 02:23:21 2009 +0100 Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison - (cherry picked from commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a) -commit 2969eaa88c4422fedf1b069e6fe055904b233db2 +commit 83d120b90482d356be730f63aead0f8e44a4e846 +Author: Colin Harrison +Date: Thu Oct 1 14:47:22 2009 +0100 + + Xming: Fix various 'ISO C90 forbids mixed declarations and code' warnings + + Signed-off-by: Jon TURNEY + +commit 78c87bdad1feab91c2a39e01513b4b0826665f06 Author: Colin Harrison Date: Fri Sep 25 17:49:59 2009 +0100 Xming: Remove unused X-boxed icon resource Signed-off-by: Jon TURNEY - (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06) -commit 92253b0f2028c6c243be5f444b59568b0c15ae1f +commit fdf7f7e95c852734c620f58df408a324902172cf Author: Colin Harrison Date: Fri Sep 25 17:46:40 2009 +0100 @@ -116,9 +429,8 @@ Date: Fri Sep 25 17:46:40 2009 +0100 Replace the obsolete DIALOG resource with DIALOGEX in the .rc file Signed-off-by: Jon TURNEY - (cherry picked from commit fdf7f7e95c852734c620f58df408a324902172cf) -commit 237bc0c2558bdda5c7ec44cbc86a65af21344ba2 +commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37 Author: Jon TURNEY Date: Sat Oct 3 13:07:23 2009 +0100 @@ -127,9 +439,8 @@ Date: Sat Oct 3 13:07:23 2009 +0100 Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled) Signed-off-by: Jon TURNEY - (cherry picked from commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37) -commit c163126f06720a4bca1d073a2fb6d138ca6f0f00 +commit 25344ba7f7845654364d62bf15322b3b79465bd9 Author: Yaakov Selkowitz Date: Tue Oct 13 20:14:58 2009 -0500 @@ -137,9 +448,22 @@ Date: Tue Oct 13 20:14:58 2009 -0500 Signed-off-by: Yaakov Selkowitz Signed-off-by: Keith Packard - (cherry picked from commit 25344ba7f7845654364d62bf15322b3b79465bd9) -commit 07229cd6da6a9b7acedb994275fed5b512fe48b1 +commit 6e158003e80534ce007290f75c89d698aec1d00b +Merge: 2b14e14 5e762f0 +Author: Keith Packard +Date: Tue Oct 13 18:40:42 2009 -0700 + + Merge remote branch 'mattst88/master' + + * mattst88/master: + [alpha] assume we have __NR_pciconfig_iobase + [alpha] don't return from void functions + Fix undefined symbols on alpha + Fix breakage on alpha caused by c7680befe5ae + Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus" + +commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f Author: Matt Turner Date: Tue Oct 13 20:42:14 2009 -0400 @@ -151,57 +475,16 @@ Date: Tue Oct 13 20:42:14 2009 -0400 The pciconfig_iobase syscall has been supported since 2000. Signed-off-by: Matt Turner - (cherry picked from commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f) -commit 13c5e2fe9c7ce82dfdc026a392327b115d8c6a15 +commit 46785c04bca16f495af3ed8d685aee939a1a8f39 Author: Matt Turner Date: Tue Oct 13 20:40:59 2009 -0400 [alpha] don't return from void functions Signed-off-by: Matt Turner - (cherry picked from commit 46785c04bca16f495af3ed8d685aee939a1a8f39) - -commit fff0b2013ad40c6116e92a9c5e233da4a34e6943 -Author: Michael Cree -Date: Wed Oct 7 18:33:29 2009 -0400 - - Fix undefined symbols on alpha - - Signed-off-by: Matt Turner - (cherry picked from commit 34eddbbb73bb16395dba0818247909c1b4bee4c2) - -commit a08186fe59f003fc9e1edceb1d95d2e316766e2a -Author: Matt Turner -Date: Tue Oct 6 20:58:30 2009 -0400 - - Fix breakage on alpha caused by c7680befe5ae - - Pinpointed by by Michael Cree. - - Commit c7680befe5ae removed Jensen support, but at the same time broke - support for dense memory systems. - - Signed-off-by: Matt Turner - (cherry picked from commit 9625f6d328d6f516520930227b218979309938bc) - -commit e116bebb1324c5cdb806a70683ca747321c536b0 -Author: Peter Hutterer -Date: Tue Oct 13 13:15:05 2009 +1000 - dix: extend IsPointerDevice check to valuator-only devices. - - A device with valuators but no keys is definitely a pointer device and needs - to be attached to the VCP. Otherwise, the class copying happens on the VCK - and the VCP isn't updated with the events that are to be sent through it. - This addresses the trigger for #24441, not the actual issue. - Jury is still out on valuator+key devices. - - Signed-off-by: Peter Hutterer - Signed-off-by: Keith Packard - (cherry picked from commit 72f5874434c0c015b671c492c1318f35f1793668) - -commit f6cb78e476132b201334655f0015a2c727434fbf +commit 2b14e142039193ea854a02706662204f4f5f6db8 Author: Jeremy Huddleston Date: Tue Oct 13 12:54:56 2009 -0700 @@ -211,9 +494,9 @@ Date: Tue Oct 13 12:54:56 2009 -0700 Signed-off-by: Colin Harrison Signed-off-by: Jeremy Huddleston - (cherry picked from commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d) + Signed-off-by: Keith Packard -commit 496350bd6832e595e42620da76d2f1e2e4c9e91d +commit 5b91dfac6fbdf35288a4558638d4923e230ab8d3 Author: Jeremy Huddleston Date: Tue Oct 13 12:54:11 2009 -0700 @@ -235,17 +518,24 @@ Date: Tue Oct 13 12:54:11 2009 -0700 Signed-off-by: Jon TURNEY Signed-off-by: Jeremy Huddleston - (cherry picked from commit 6980f77892e0409b44bd8f33ba82e7273c6462a4) + Signed-off-by: Keith Packard -commit 5411e78bd51df86f6cdf925f65fd3725f943b6bb +commit 72f5874434c0c015b671c492c1318f35f1793668 Author: Peter Hutterer -Date: Mon Oct 12 14:12:45 2009 +1000 +Date: Tue Oct 13 13:15:05 2009 +1000 - xserver 1.7.0.901 + dix: extend IsPointerDevice check to valuator-only devices. + + A device with valuators but no keys is definitely a pointer device and needs + to be attached to the VCP. Otherwise, the class copying happens on the VCK + and the VCP isn't updated with the events that are to be sent through it. + This addresses the trigger for #24441, not the actual issue. + Jury is still out on valuator+key devices. Signed-off-by: Peter Hutterer + Signed-off-by: Keith Packard -commit b6e723eaebe79116dfa15162851b02bbdc29be2a +commit 1088073b11ed488c0df45af3867b900ef93c6fe1 Author: Michel Dänzer Date: Fri Oct 9 11:31:44 2009 +0200 @@ -256,9 +546,8 @@ Date: Fri Oct 9 11:31:44 2009 +0200 Signed-off-by: Michel Dänzer Signed-off-by: Keith Packard - (cherry picked from commit 1088073b11ed488c0df45af3867b900ef93c6fe1) -commit 2e37bda8d6b0203973893d8440d9917975f53d97 +commit 55305cf8db7787883bc80b7348eb626e609626f8 Author: Ben Skeggs Date: Fri Oct 9 16:08:15 2009 -0700 @@ -273,9 +562,8 @@ Date: Fri Oct 9 16:08:15 2009 -0700 Signed-off-by: Ben Skeggs Signed-off-by: Michel Dänzer - (cherry picked from commit 55305cf8db7787883bc80b7348eb626e609626f8) -commit 6d99a7de3f2c60bf90faf604b1a39d4aa5bdfd09 +commit b375be9285c40467578fac2f1360c29a75306ab4 Author: Michel Dänzer Date: Fri Oct 9 11:31:46 2009 +0200 @@ -288,9 +576,8 @@ Date: Fri Oct 9 11:31:46 2009 +0200 Signed-off-by: Michel Dänzer Tested-by: Aaron Plattner Signed-off-by: Keith Packard - (cherry picked from commit b375be9285c40467578fac2f1360c29a75306ab4) -commit 398b5e01a7976ee8940105cf2be7c28ce57c3858 +commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44 Author: Alan Coopersmith Date: Wed Oct 7 22:10:55 2009 -0700 @@ -303,19 +590,142 @@ Date: Wed Oct 7 22:10:55 2009 -0700 Signed-off-by: Alan Coopersmith Acked-by: Peter Hutterer Signed-off-by: Keith Packard - (cherry picked from commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44) -commit b916ac74e27ce8998ac0866bb2b39dcd378e0182 -Author: Jeremy Huddleston -Date: Fri Oct 2 18:58:35 2009 -0700 +commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b +Author: Jamey Sharp +Date: Thu Oct 8 13:38:44 2009 +1100 - XQuartz: Send mouse location with scroll events. + Cast small-int values through intptr_t when passed as pointers - This fixes the problem where (0, 0) was sent as the mouse location with scroll - button events causing the event to not reach the client. - (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798) + On 64-bit systems, int and pointers don't have the same size, so GCC gives + warnings about casts between int and pointer types. However, in the cases + covered by this patch, it's always a value that fits in int being stored + temporarily as a pointer and then converted back later, which is safe. + Casting through the pointer-sized integer type intptr_t convinces the + compiler that this is OK. + + Signed-off-by: Jamey Sharp + Signed-off-by: Daniel Stone + +commit b680a89262efcfef4644adb4a61ae42ea0db0c93 +Author: Jamey Sharp +Date: Thu Oct 8 13:38:01 2009 +1100 + + Fix GCC warnings in xorg_backtrace + + Signed-off-by: Jamey Sharp + Signed-off-by: Daniel Stone + +commit 9bf2ff4faf730913de3073f346646a8727be41d4 +Author: Jamey Sharp +Date: Thu Oct 8 13:36:44 2009 +1100 + + Fix "possibly uninitialized" warnings in glx + + In both functions, "answer" was uninitialized if "compsize" was 0, but in + that case __GLX_SEND_VOID_ARRAY(compsize) results in a call to + WriteToClient for 0 bytes, which returns immediately without examining the + "answer" argument. So initializing to a null pointer is as good as + anything else. + + Signed-off-by: Jamey Sharp + Signed-off-by: Daniel Stone + +commit b422b532f3dcab54c53f61a66f2ad76059d1874a +Author: Jamey Sharp +Date: Thu Oct 8 13:29:27 2009 +1100 + + Remove static MAXSCREENS limit from Xext/shm.c + + Dynamically allocate per-screen data in the SHM extension, instead of + having a single static-sized array. + + Signed-off-by: Jamey Sharp + Signed-off-by: Daniel Stone + +commit 4df3e8c8053d9d4b3043f339a73d0de97020d884 +Author: Martin Ettl +Date: Thu Oct 8 13:27:30 2009 +1100 + + Resource leakage: 0 is a valid file descriptor + + When testing if an fd is valid, the required construct is >= 0, not > 0. + + [Daniel: Fixed up the Linux MTRR case as well.] + + Signed-off-by: Martin Ettl + Signed-off-by: Daniel Stone + +commit 4151a13c80f3afa43f88afcf19a7aeb16dace93a +Author: Francisco Jerez +Date: Mon Oct 5 02:39:03 2009 +0200 + + dix: Fix a double free in dixFreePrivates. + + It can be reproduced when the server is regenerated and for some + reason the private keys are reassigned in a different order: a + manually allocated private may get an index formerly used by a + preallocated private. In that case it will first be manually freed and + then again by dixFreePrivates, as items[i].size was never zeroed + out. Do it in dixResetPrivates. + + Signed-off-by: Francisco Jerez + Acked-by: Eamon Walsh + Signed-off-by: Keith Packard + +commit 34eddbbb73bb16395dba0818247909c1b4bee4c2 +Author: Michael Cree +Date: Wed Oct 7 18:33:29 2009 -0400 + + Fix undefined symbols on alpha + + Signed-off-by: Matt Turner + +commit 44efcdde501d54ca9c3e33ab5b1f699956fc3f9f +Author: Jamey Sharp +Date: Wed Oct 7 09:07:03 2009 -0700 + + Fix overlay detection when matching Xv adaptors across screens. + + Signed-off-by: Jamey Sharp + Acked-by: Adam Jackson + Signed-off-by: Keith Packard + +commit 68304215e25876ee639015969b4f07e1c9c515e0 +Merge: 6676f49 315aaef +Author: Keith Packard +Date: Tue Oct 6 22:41:42 2009 -0700 + + Merge remote branch 'alanc/master' + + Conflicts: + configure.ac + + Signed-off-by: Keith Packard + +commit 315aaef55750a863c08a16ad9120ffb76f9b48e0 +Author: Alan Coopersmith +Date: Fri Oct 2 21:54:53 2009 -0700 + + Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active + + Signed-off-by: Alan Coopersmith + Reviewed-by: Eric Anholt + Acked-by: Dan Nicholson + Acked-by: Peter Hutterer + +commit 2e294380b64b6362173d0590c4292f290e50af50 +Author: Alan Coopersmith +Date: Fri Oct 2 16:51:24 2009 -0700 + + Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith + Reviewed-by: Eric Anholt + Acked-by: Dan Nicholson + Acked-by: Peter Hutterer -commit a4ce2aa6348ecca3a5b1ac8d87caf974bdad3455 +commit 4b0911565d18b1aefca564315d0f1b9b4a17aa65 Author: Alan Coopersmith Date: Mon Oct 5 16:52:19 2009 -0700 @@ -327,29 +737,38 @@ Date: Mon Oct 5 16:52:19 2009 -0700 Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston -commit 22fd21a71d3dc98a94cc5f6592832e1d19bb479a -Author: Alan Coopersmith -Date: Tue Sep 15 19:17:48 2009 -0700 +commit 8c51b886400c5962b31ff565771be1b01a3ca8fb +Author: Julien Cristau +Date: Tue Oct 6 16:08:42 2009 +0200 - Fix build of unit tests when dtrace probes are enabled + configure: quote argument to m4_pattern_forbid - ar loses the dtrace probe magic when building static libraries, so we - have to link with the .O files in order to resolve the dtrace probe symbols. + Without this, configure spits out + ../configure: line 15460: ac_fn_c_check_member: command not found - Signed-off-by: Alan Coopersmith + Also anchor the pattern to make it stricter. + + Signed-off-by: Julien Cristau + Signed-off-by: Dan Nicholson + Signed-off-by: Keith Packard -commit 8e3299eee8c2d909f34ec070f6f606a278c46330 +commit 6ee61578ddb9f880ef12bbe9c3671d7dd53f2809 Author: Alan Coopersmith -Date: Fri Oct 2 20:44:19 2009 -0700 +Date: Mon Oct 5 17:27:27 2009 -0700 - Set XQUARTZ to no on non-Darwin OS'es + Remove shave now that automake-1.11 has AM_SILENT_RULES - Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe + Revert "Add shave so that we can see the steaming piles of warnings generated." + This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b. + + shave was left in the xserver 1.7 release/branch to allow developers & + distros time to transition to automake-1.11. xserver 1.8 series will + require automake-1.11 for silencing build noise. Signed-off-by: Alan Coopersmith - Reviewed-by: Jeremy Huddleston + Signed-off-by: Keith Packard -commit f496e0042b1174d8831f061cd156ac7bbbb76a7c +commit d5d960f57834f16164457dab2e80290717dbf2cd Author: Kim Woelders Date: Fri Oct 2 19:31:15 2009 +0200 @@ -358,9 +777,8 @@ Date: Fri Oct 2 19:31:15 2009 +0200 Signed-off-by: Kim Woelders Reviewed-by: Soren Sandmann Pedersen Signed-off-by: Peter Hutterer - (cherry picked from commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f) -commit 5bc90ffdee0e95727767ce3df9154ea3ff3d6f95 +commit d2118c8ca94fc7bcb8e0de547e63cf022f53a8a9 Author: Peter Hutterer Date: Mon Oct 5 15:31:54 2009 +1000 @@ -372,9 +790,8 @@ Date: Mon Oct 5 15:31:54 2009 +1000 Reported-by: Felix Wenk Signed-off-by: Peter Hutterer Signed-off-by: Daniel Stone - (cherry picked from commit bd7430a32e63df8cd60352764744076448ee623f) -commit 5c35d07c3b0fc8cc60fc622d6eb444bea2be0acc +commit bf116057c7efd43c247c93f2f5d733a5db857cc9 Author: Peter Hutterer Date: Mon Oct 5 10:44:43 2009 +1000 @@ -389,74 +806,138 @@ Date: Mon Oct 5 10:44:43 2009 +1000 Reported-by: Mark Rosenstand Signed-off-by: Peter Hutterer - (cherry picked from commit c629e0fc50dfaffaa40a56709da7f035c289fed2) -commit b6016134b53587b8f942243d95729bb902c58db4 -Author: Jeremy Huddleston -Date: Mon Sep 28 17:05:29 2009 -0700 +commit 9625f6d328d6f516520930227b218979309938bc +Author: Matt Turner +Date: Tue Oct 6 20:58:30 2009 -0400 - XQuartz: Set the proper bitmap for key repeats... + Fix breakage on alpha caused by c7680befe5ae - XkbSetRepeatKeys lies and doesn't do what it says it will... + Pinpointed by by Michael Cree. - (cherry picked from commits b9dfed9e88389cbd29406a20d38ee4297638649b and - 873467adad479be02cd9cc6b43685919f5612d91) + Commit c7680befe5ae removed Jensen support, but at the same time broke + support for dense memory systems. + + Signed-off-by: Matt Turner -commit 3808ecc99a8d64cdbe3fb4a3b57c59e7545e362c -Author: Jeremy Huddleston -Date: Mon Sep 28 17:47:31 2009 -0700 +commit aa07957373fd7cbe67458a001e4afd6a7f1ea37f +Author: Peter Hutterer +Date: Mon Sep 28 12:20:03 2009 +1000 - XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option. + Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus" - This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still. - (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671) + The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus. + + This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8. + + Signed-off-by: Peter Hutterer -commit 80735dbf560ba156e53cd2a46190b334de281dd6 -Author: Nirbheek Chauhan -Date: Tue Sep 29 22:35:06 2009 +0530 +commit 6676f49e34f8db7ef5767a6dbf6c2a4d2087f79c +Author: Julien Cristau +Date: Tue Oct 6 16:08:42 2009 +0200 - xkb: check permissions on XKM_OUTPUT_DIR + configure: quote argument to m4_pattern_forbid - Checking just for root is insufficient since that does not guarantee write/read - permissions in XKM_OUTPUT_DIR (for example with sandbox). + Without this, configure spits out + ../configure: line 15460: ac_fn_c_check_member: command not found - Check if we can write a file, as well as read it later. Otherwise, invoke the - fallback to /tmp + Also anchor the pattern to make it stricter. - Signed-off-by: Nirbheek Chauhan - Signed-off-by: Rémi Cardona + Signed-off-by: Julien Cristau + Signed-off-by: Dan Nicholson + Signed-off-by: Keith Packard + +commit a0363bf7b135d816e73849c91fa53d98fd6072d1 +Author: Alan Coopersmith +Date: Mon Oct 5 17:27:27 2009 -0700 + + Remove shave now that automake-1.11 has AM_SILENT_RULES + + Revert "Add shave so that we can see the steaming piles of warnings generated." + This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b. + + shave was left in the xserver 1.7 release/branch to allow developers & + distros time to transition to automake-1.11. xserver 1.8 series will + require automake-1.11 for silencing build noise. + + Signed-off-by: Alan Coopersmith + Signed-off-by: Keith Packard + +commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f +Author: Kim Woelders +Date: Fri Oct 2 19:31:15 2009 +0200 + + render: Fix clip region translation in miClipPictureSrc(). + + Signed-off-by: Kim Woelders + Reviewed-by: Soren Sandmann Pedersen + Signed-off-by: Peter Hutterer + +commit bd7430a32e63df8cd60352764744076448ee623f +Author: Peter Hutterer +Date: Mon Oct 5 15:31:54 2009 +1000 + + xfree86: remove log-spamming DebugF + + All input drivers use xf86PostKeyEventP indirectly now and have been since + it exists. I guess that qualifies it as tested - no need to spam the logs. + + Reported-by: Felix Wenk + Signed-off-by: Peter Hutterer + Signed-off-by: Daniel Stone + +commit 1a2dde3335864abfbbc133dbc709f564272dd540 +Author: Alan Coopersmith +Date: Fri Oct 2 20:44:19 2009 -0700 + + Set XQUARTZ to no on non-Darwin OS'es + + Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe + + Signed-off-by: Alan Coopersmith + Reviewed-by: Jeremy Huddleston + +commit c629e0fc50dfaffaa40a56709da7f035c289fed2 +Author: Peter Hutterer +Date: Mon Oct 5 10:44:43 2009 +1000 + + Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1 + + libXtst requirement is already implicit since we require xextproto 7.1 and + that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless, + list it explicitly. + + Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1. + Complementing that is libdmx 1.0.99.1 with the dmxext.h header file. + + Reported-by: Mark Rosenstand Signed-off-by: Peter Hutterer - (cherry picked from commit 9bc7cbf9c02656982c2525836b5498993f708e02) -commit 616c7a009d9c4e84a8882ac797092d61619c1339 +commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa Author: Jeremy Huddleston -Date: Thu Oct 1 11:58:18 2009 -0700 +Date: Fri Oct 2 19:20:24 2009 -0700 - XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0 - - Is fink really _still_ relying on this X11R7.x version string? - (cherry picked from commit 3d7cf468df96c0130a862f0d93fec990b9110c2f) + XQuartz: Fix a possible minor memory leak -commit 19592ee7748a32388d90d802bb4f5e2bff15863e -Author: Kim Woelders -Date: Tue Sep 29 20:31:45 2009 +0200 +commit c4886fbabc1d8b4054654b227fcad83f58e8e798 +Author: Jeremy Huddleston +Date: Fri Oct 2 18:58:35 2009 -0700 - dix: Fix potential memory corruption in doListFontsWithInfo. + XQuartz: Send mouse location with scroll events. - Signed-off-by: Kim Woelders - Reviewed-by: Keith Packard - Signed-off-by: Peter Hutterer - (cherry picked from commit 4970666827e65424ee17ccf6341ff84aac974383) + This fixes the problem where (0, 0) was sent as the mouse location with scroll + button events causing the event to not reach the client. -commit 4257023c1e40387aff096d5f00d746d3f7a521b4 -Author: Peter Hutterer -Date: Fri Oct 2 14:05:43 2009 +1000 +commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5 +Author: Ian Romanick +Date: Thu Oct 1 10:39:19 2009 -0700 - xserver 1.7.0 + GLX: More clearly document the GLX protocol version handling - Signed-off-by: Peter Hutterer + Signed-off-by: Ian Romanick + Acked-by: Peter Hutterer -commit 15b4faff281ad8abce6b32fe2fc855eb6da42476 +commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b Author: Peter Hutterer Date: Thu Oct 1 21:19:11 2009 +1000 @@ -472,9 +953,8 @@ Date: Thu Oct 1 21:19:11 2009 +1000 Signed-off-by: Peter Hutterer Acked-by: Simon Thum - (cherry picked from commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b) -commit 3788113618977bdc83e3ec1e7ca3160bad9a0d13 +commit 64fe5784b49347e1fd27b0c463be5c16557594c9 Author: Peter Hutterer Date: Fri Oct 2 09:34:24 2009 +1000 @@ -483,9 +963,8 @@ Date: Fri Oct 2 09:34:24 2009 +1000 Tested-by: Xavier Chantry Signed-off-by: Peter Hutterer Acked-by: Julien Cristau - (cherry picked from commit 64fe5784b49347e1fd27b0c463be5c16557594c9) -commit c3034dc3af450802dda156136d9fabbc1cc58836 +commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80 Author: Dave Airlie Date: Thu Oct 1 15:25:55 2009 +1000 @@ -499,9 +978,49 @@ Date: Thu Oct 1 15:25:55 2009 +1000 Signed-off-by: Dave Airlie Declared-as-sane-by: Keith Packard Signed-off-by: Peter Hutterer - (cherry picked from commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80) -commit 47c0b80915d67346ec63b36b659a96b77e777a71 +commit cb54cf1b3e8c4109541cfb698542c00f2473e731 +Author: Dave Airlie +Date: Wed Sep 30 11:33:16 2009 +1000 + + glx: fixup deref of null pointer when glx screen init fails. + + I think this is what the original author wanted. + + Signed-off-by: Dave Airlie + Acked-by: Ian Romanick + +commit 3d7cf468df96c0130a862f0d93fec990b9110c2f +Author: Jeremy Huddleston +Date: Thu Oct 1 11:58:18 2009 -0700 + + XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0 + + Is fink really _still_ relying on this X11R7.x version string? + +commit 85b831f701d085e514afcf8a5ce9b11f8a57984e +Author: Julien Cristau +Date: Thu Oct 1 17:27:11 2009 +0200 + + xfree86: fix xorg.conf manpage formatting error + +commit 9bc7cbf9c02656982c2525836b5498993f708e02 +Author: Nirbheek Chauhan +Date: Tue Sep 29 22:35:06 2009 +0530 + + xkb: check permissions on XKM_OUTPUT_DIR + + Checking just for root is insufficient since that does not guarantee write/read + permissions in XKM_OUTPUT_DIR (for example with sandbox). + + Check if we can write a file, as well as read it later. Otherwise, invoke the + fallback to /tmp + + Signed-off-by: Nirbheek Chauhan + Signed-off-by: Rémi Cardona + Signed-off-by: Peter Hutterer + +commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5 Author: Peter Hutterer Date: Thu Oct 1 10:03:42 2009 +1000 @@ -524,9 +1043,8 @@ Date: Thu Oct 1 10:03:42 2009 +1000 Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard - (cherry picked from commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5) -commit 30ebee3bfcadf915be98d407610c615e3e00f9c1 +commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7 Author: Peter Hutterer Date: Thu Oct 1 15:22:19 2009 +1000 @@ -539,9 +1057,8 @@ Date: Thu Oct 1 15:22:19 2009 +1000 Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard - (cherry picked from commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7) -commit 8026c5a08584419be3adecd5965dd03e793ddf81 +commit b5fcc5553eb784c9f4826936e839079c0cdee55a Author: Michel Dänzer Date: Thu Oct 1 15:17:11 2009 +1000 @@ -554,9 +1071,8 @@ Date: Thu Oct 1 15:17:11 2009 +1000 Signed-off-by: Dave Airlie Signed-off-by: Peter Hutterer - (cherry picked from commit b5fcc5553eb784c9f4826936e839079c0cdee55a) -commit e182c1b4368c6958579732dd4ddc59de2b46359b +commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc Author: Keith Packard Date: Wed Sep 30 11:40:19 2009 -0700 @@ -572,9 +1088,32 @@ Date: Wed Sep 30 11:40:19 2009 -0700 Signed-off-by: Keith Packard Signed-off-by: Peter Hutterer - (cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc) -commit 369b5d526b699cd1c5cd38bb5a823ec66c5286ef +commit 873467adad479be02cd9cc6b43685919f5612d91 +Author: Jeremy Huddleston +Date: Wed Sep 30 00:22:02 2009 -0700 + + XQuartz: Set the proper bitmap for key repeats... + + XkbSetRepeatKeys lies and doesn't do what it says it will... + +commit 7bef78e199a4e4f7916be506807513efcd8fd4cb +Author: Jeremy Huddleston +Date: Tue Sep 29 23:40:47 2009 -0700 + + xkb: Use XkbPerKeyBitArraySize instead of hardcoded value of 32 + +commit 4970666827e65424ee17ccf6341ff84aac974383 +Author: Kim Woelders +Date: Tue Sep 29 20:31:45 2009 +0200 + + dix: Fix potential memory corruption in doListFontsWithInfo. + + Signed-off-by: Kim Woelders + Reviewed-by: Keith Packard + Signed-off-by: Peter Hutterer + +commit 6ffda5aae75272fabdc27d6f693ae827be119e95 Author: Dave Airlie Date: Tue Sep 29 11:49:09 2009 +1000 @@ -595,18 +1134,53 @@ Date: Tue Sep 29 11:49:09 2009 +1000 Signed-off-by: Dave Airlie Reviewed-by: Keith Packard Signed-off-by: Peter Hutterer - (cherry picked from commit 6ffda5aae75272fabdc27d6f693ae827be119e95) -commit d3ba814884154150ed3e6a71254dec7312593488 +commit ad5c0d9efa47476ed5cf75c82265c73919e468b4 +Author: Ian Romanick +Date: Tue Sep 29 16:43:43 2009 -0700 + + GLX: Enable GLX 1.4 on DRI2 + + Return the minimum GLX version supported by all screens. Assume that + DRI2 screens have all the required features for GLX 1.4. Assume that + everyone else can only support GLX 1.2. + + Reviewed-by: Kristian Høgsberg + Reviewed-by: Jesse Barnes + +commit f11a356bcef1bc0a6440325019d5967b745a42dd +Author: Jeremy Huddleston +Date: Mon Sep 28 17:05:29 2009 -0700 + + XQuartz: Cleaned up keymap setting for easier maintenance + (cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b) + +commit f3223c71cfc638e695981e527517d48ea00d124d +Author: Jeremy Huddleston +Date: Mon Sep 28 23:01:59 2009 -0700 + + XQuartz: Remove the redundant xquartz_resetenv_display + unsetenv(DISPLAY) takes care of this for us anyway + (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e) + +commit 9b98b883227ed23d5470e8de689afeec4a0fd742 +Author: Jeremy Huddleston +Date: Mon Sep 28 17:47:31 2009 -0700 + + XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option. + + This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still. + (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671) + +commit 11817a881cb93a89788105d1e575a468f2a8d27c Author: Michel Dänzer Date: Tue Sep 29 08:56:59 2009 +0200 Fix ShmPutImage non-ZPixmap case. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 . - (cherry picked from commit 11817a881cb93a89788105d1e575a468f2a8d27c) -commit 8fc0d54cbaf791d947c7bab23f2e982cabd7c958 +commit 19be992d9dc542b61fa3f4fd32a09071c9e64880 Author: Peter Hutterer Date: Mon Sep 28 14:18:45 2009 +1000 @@ -631,148 +1205,127 @@ Date: Mon Sep 28 14:18:45 2009 +1000 Tested-by: Vic Lee Signed-off-by: Peter Hutterer - (cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880) - -commit 857ec3e6fff571398dfcd9b4728b5c38cbcd3fcb -Author: Peter Hutterer -Date: Mon Sep 28 13:59:25 2009 +1000 - - xfree86: use the DDC size if either width or height of DisplaySize is bogus. - - If either width or height of DisplaySize is invalid, assume that the - configuration is invalid and use the DDC-reported values instead. - - See Comment 9, Bug 9758. - http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9 - - Signed-off-by: Peter Hutterer - Acked-by: Dave Airlie - (cherry picked from commit 83023ffd09a84ff48e6b99f57ebad101a00478db) - -commit 2d4bab18c0d894619f044f29769c67c2f63b540a -Author: Peter Hutterer -Date: Wed Sep 23 10:53:51 2009 +1000 - - render: Plug a memory leak in AddGlyph. (#23286) - - AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting - in a memory leak when more than one Glyph was added in a RenderAddGlyphs - request. - - Since the code in AddGlyph and DeleteGlyph is identical, move into a static - function to avoid such mistakes in the future. - - X.Org Bug 23286 - (cherry picked from commit f772014c435f56db56520ca13ffa39431684f122) - -commit 290a9639db3e420ec4caf0e6aee9f7386724c765 -Author: Peter Hutterer -Date: Mon Sep 28 21:05:11 2009 +1000 - - xserver 1.6.99.903 (xserver 1.7 RC3) - - Signed-off-by: Peter Hutterer - -commit 8c83457c60a4e02ca61086c7218dcd0e054926ba -Merge: 6af44db b49dba3 -Author: Peter Hutterer -Date: Mon Sep 28 16:48:46 2009 +1000 - - Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch - -commit 6af44db315121ea24cec390d144514bf56908b2c -Author: Tilman Sauerbeck -Date: Thu Sep 24 12:57:02 2009 +0200 - - configure: make XNEST default to auto. - - When we're checking whether to build Xnest, we're comparing the - variable to auto but before it never was assigned that. - - Signed-off-by: Tilman Sauerbeck - - [Xnest was enabled to yes to increase build exposure and catch compiler - errors early. The requirements to Xnest are quite low and I expect most - developers have them, so Xnext will be enabled on most boxes. Anyone - missing those requires probably doesn't want to build Xnest anyway.] - Signed-off-by: Peter Hutterer - (cherry picked from commit 3db28f92b0c810b452506abbed299a204c90ba0b) -commit b49dba33f94b51ba9a14803f0d81ccde2cb778f8 +commit efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe Author: Ben Byer Date: Sun Sep 27 10:35:53 2009 -0700 Add (ok, fix) support for DTrace under OS X (cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2) -commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e +commit b3415187e92960cbff784108b5a3a8d130dc34c5 Author: Jeremy Huddleston Date: Sun Sep 27 23:09:51 2009 -0700 Rootless: Correct border rendering on parent-relative windows Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow + (cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e) -commit dadab5a2279a19dcf709402d7f22f0cd48670db0 +commit 6df00917cab5c1096070625385fd76ee6c52e0f1 Author: Jeremy Huddleston Date: Sun Sep 27 23:00:59 2009 -0700 XQuartz: Fix QuartzSetCursor to match the expected prototype. + (cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0) -commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8 +commit 67a51cd9ef60b4c9f25fdde84f9eb352936c8c67 Author: Jeremy Huddleston Date: Sun Sep 27 22:57:25 2009 -0700 XQuartz: Fix a bunch of compilation warnings about style + (cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8) -commit 29cb904e4de2411a9b6dbe68694954788f0525f7 +commit 96780eaf32636c94a9cf33f22eb9f01d984ff754 Author: Jeremy Huddleston Date: Sun Sep 27 22:29:49 2009 -0700 XQuartz: Nuke TSM It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye. + (cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7) -commit de6cee11e1c335a0e5f708e7641e81d3cfe52529 +commit 15e15816a2f011d0aeeaff9e394d30a147c973ce Author: Jeremy Huddleston Date: Sun Sep 27 22:26:22 2009 -0700 XQuartz: Fix inverse map from mode_switch to alt + (cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529) -commit 7e6640b55503b6ee797ab2589f7debcbfa531958 -Author: Peter Hutterer -Date: Mon Sep 28 12:20:03 2009 +1000 - - Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus" - - The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus. - - This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8. - - Signed-off-by: Peter Hutterer - -commit ceaa5c779ceed3de5ea53727649613be3133b24e +commit 558d803b2966c2e44345a80e635e091dc3e49f02 Author: Jeremy Huddleston Date: Sun Sep 27 18:25:57 2009 -0700 XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap. We need to find a better way to work with XKB on this. + (cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e) -commit a3dbde2de87ee4f577748a8c447501a3ea462559 +commit 226b1033b48807fd6871ba626e20ef1411904939 Author: Jeremy Huddleston Date: Sun Sep 27 17:08:12 2009 -0700 XQuartz: Transition from xEvent based mieq to InternalEvent + (cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559) + +commit 0c2731596f27f2cdf5000ba41de37e7eb86ad6f9 +Author: Peter Hutterer +Date: Mon Sep 28 15:07:48 2009 +1000 + + Put tests for zero-sized strings in quotes (#24060) + + X.Org Bug 24060 + + Signed-off-by: Peter Hutterer + +commit 83023ffd09a84ff48e6b99f57ebad101a00478db +Author: Peter Hutterer +Date: Mon Sep 28 13:59:25 2009 +1000 + + xfree86: use the DDC size if either width or height of DisplaySize is bogus. + + If either width or height of DisplaySize is invalid, assume that the + configuration is invalid and use the DDC-reported values instead. + + See Comment 9, Bug 9758. + http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9 + + Signed-off-by: Peter Hutterer + Acked-by: Dave Airlie -commit 4aeac52c495c4cf691de7ef7d9e4030e90b3c8b8 -Merge: 498135f 77099b9 +commit f772014c435f56db56520ca13ffa39431684f122 Author: Peter Hutterer -Date: Mon Sep 28 09:54:53 2009 +1000 +Date: Wed Sep 23 10:53:51 2009 +1000 + + render: Plug a memory leak in AddGlyph. (#23286) + + AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting + in a memory leak when more than one Glyph was added in a RenderAddGlyphs + request. + + Since the code in AddGlyph and DeleteGlyph is identical, move into a static + function to avoid such mistakes in the future. + + X.Org Bug 23286 + +commit 3db28f92b0c810b452506abbed299a204c90ba0b +Author: Tilman Sauerbeck +Date: Thu Sep 24 12:57:02 2009 +0200 - Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch + configure: make XNEST default to auto. + + When we're checking whether to build Xnest, we're comparing the + variable to auto but before it never was assigned that. + + Signed-off-by: Tilman Sauerbeck + + [Xnest was enabled to yes to increase build exposure and catch compiler + errors early. The requirements to Xnest are quite low and I expect most + developers have them, so Xnext will be enabled on most boxes. Anyone + missing those requires probably doesn't want to build Xnest anyway.] + Signed-off-by: Peter Hutterer -commit 498135f26e8504e103ffe4512acf6fddca8e92e8 +commit 78ad6ca9a97440b74019c00a28144ea7d1e03431 Author: Samuel Thibault Date: Sun Sep 27 17:30:23 2009 +0200 @@ -782,42 +1335,52 @@ Date: Sun Sep 27 17:30:23 2009 +0200 trivial patch, please apply. Signed-off-by: Julien Cristau - (cherry picked from commit 78ad6ca9a97440b74019c00a28144ea7d1e03431) -commit 77099b933a0362d40a28f9afea46c5cc97c29e13 +commit fb7938315bed9d4cb5641ee9acebf78a13bc109e +Author: Jeremy Huddleston +Date: Sun Sep 27 09:48:43 2009 -0700 + + Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu + (cherry picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f) + +commit a2cd21177859eb45320a94c96dde7d9058ab7650 Author: Jeremy Huddleston Date: Sat Sep 26 23:41:45 2009 -0700 XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish (cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8) -commit 7958f6b75b3c6b8a827188af2e684f181bdd7688 +commit fbfbf93405222322571e15e78dea57c8f2755eae Author: Jeremy Huddleston Date: Sat Sep 26 22:52:39 2009 -0700 XQuartz: Add pressure/tilt property labels + (cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56) -commit 29b2d9cdf5095399b79d9ff2a2f12f5a9c49cf1f +commit 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f Author: Jeremy Huddleston Date: Sat Sep 26 22:48:49 2009 -0700 XQuartz: Fix a brain-o array indexing problem /bop Peter + (cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb) -commit fd1adc21a931e2dd1ff2e52b60a77c2153a30fe0 +commit 7159381881e5da33a49e8735811b93cbfe4f681e Author: Jeremy Huddleston Date: Sat Sep 26 22:17:09 2009 -0700 XQuartz: Nuke duplicate locks that make painful headaches + (cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0) -commit 6e4fc5d066d9c1ea4fca444cfee1e73147c5fefb +commit fba8c702ba6aa8fac27682e0838fd744e197d54f Author: Jeremy Huddleston Date: Sat Sep 26 22:13:49 2009 -0700 Xi: CopyKeyClass is not static for XQuartz + (cherry picked from commit 85d6402354cdf143c6490f2725744c2f08b5605b) -commit e0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7 +commit dc1e1bebff8b9d1eb6196dfd4b2f52f1e4200efa Author: Jeremy Huddleston Date: Fri Aug 7 00:02:21 2009 -0700 @@ -825,16 +1388,7 @@ Date: Fri Aug 7 00:02:21 2009 -0700 (cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be) (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c) -commit 1a0dfde2d102d845f1ceda66ad7a078aa1b42ef9 -Author: Jeremy Huddleston -Date: Wed Sep 23 17:41:28 2009 -0700 - - XQuartz: GLX capabilities: Allow 16bit accumulation buffers - - http://xquartz.macosforge.org/trac/ticket/308 - (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22) - -commit 0c6423b3d52af85cd990811f7be982c0b6ed7c32 +commit 73ae547d5e687ef10dea45801fc627e10ac4b659 Author: Michel Dänzer Date: Sun Sep 27 02:08:10 2009 +0200 @@ -850,9 +1404,8 @@ Date: Sun Sep 27 02:08:10 2009 +0200 but use pPixmap->devPrivate.ptr after PrepareAccess instead. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24167 . - (cherry picked from commit 73ae547d5e687ef10dea45801fc627e10ac4b659) -commit bb7c26e38c262614c5d1c21fc7a04c71a9028e51 +commit c9ec2bab2f258798fd6e6676698c732f09571a60 Author: Kevin E Martin Date: Sat Sep 26 13:10:54 2009 +1000 @@ -863,18 +1416,16 @@ Date: Sat Sep 26 13:10:54 2009 +1000 miinitext.c, where they belong. Signed-off-by: Peter Hutterer - (cherry picked from commit c9ec2bab2f258798fd6e6676698c732f09571a60) -commit 72f0194be1558f244bad85197ccc50e17561df50 +commit fc9d733bab3ff0e4e51b19c73b66196dca563a70 Author: Kevin E Martin Date: Sat Sep 26 13:09:52 2009 +1000 dmx: reshuffle linker order to avoid errors when MITSHM is undefined. Signed-off-by: Peter Hutterer - (cherry picked from commit fc9d733bab3ff0e4e51b19c73b66196dca563a70) -commit e4edb4f2e6ca960b68629783459920faa86d8671 +commit e7c2598f565e8252dd66ee3e6212b310856476cb Author: Peter Hutterer Date: Fri Sep 25 14:53:33 2009 +1000 @@ -888,9 +1439,20 @@ Date: Fri Sep 25 14:53:33 2009 +1000 Tested-by: Kevin Martin Signed-off-by: Peter Hutterer - (cherry picked from commit e7c2598f565e8252dd66ee3e6212b310856476cb) -commit 7c9e0b07780b664ebbcee2d6be4bce645cb8c5b2 +commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3 +Author: Peter Hutterer +Date: Wed Sep 23 21:49:11 2009 +1000 + + configure: Unify all library defines that require a specific version. + + This patch moves all libraries that require a specific version into a single + location instead or duplicating them across the configure.ac file. + Libraries that do not require specific versions are left where they are. + + Signed-off-by: Peter Hutterer + +commit 9bd08c690fc687c4d69bb70536f3079a9184476d Author: Peter Hutterer Date: Thu Sep 24 14:07:26 2009 +1000 @@ -902,22 +1464,30 @@ Date: Thu Sep 24 14:07:26 2009 +1000 Reported-by: Thomas Jaeger Tested-by: Thomas Jaeger Signed-off-by: Peter Hutterer - (cherry picked from commit 9bd08c690fc687c4d69bb70536f3079a9184476d) -commit 1745808c2939d7dc08d3d8acae425e5eeb6a16ca -Author: Peter Hutterer -Date: Wed Sep 23 21:49:11 2009 +1000 +commit abb8108fb44cc9b08fe4ae7d805a0a22564ca6bb +Author: Michel Dänzer +Date: Sat Sep 26 02:05:24 2009 +0200 - configure: Unify all library defines that require a specific version. - - This patch moves all libraries that require a specific version into a single - location instead or duplicating them across the configure.ac file. - Libraries that do not require specific versions are left where they are. + EXA: Only calculate cache position once for each glyph. + +commit c11678cc189551f2a01eaa7a63969c16950739b4 +Author: Michel Dänzer +Date: Sat Sep 26 02:05:06 2009 +0200 + + EXA: Accumulate arbitrary number of glyphs without flushing. + +commit 0369eeeb6bf8a808fa2df503fc8b8df81e6e07b8 +Author: Michel Dänzer +Date: Sat Sep 26 02:04:48 2009 +0200 + + EXA: Try to minimize UploadToScreen calls for mixed pixmaps. - Signed-off-by: Peter Hutterer - (cherry picked from commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3) + If there are several software fallbacks affecting the system memory copy of the + same pixmap, only copy the results back to the driver pixmap when it's used for + acceleration again, or in the BlockHandler, whichever happens first. -commit e5371c7fc895c51092bd5b2d303e4835c123bd5c +commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef Author: Michel Dänzer Date: Sat Sep 26 01:59:39 2009 +0200 @@ -942,9 +1512,19 @@ Date: Sat Sep 26 01:59:39 2009 +0200 Drivers which can handle all pixmaps in the PrepareAccess hook should notice little if any difference. - (cherry picked from commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef) -commit cecd484fbb3db273472d0bf0ec45d8604ff0cde2 +commit e23bffc41b007f1bc2b8f5cd4ac54213062c95cc +Author: Alan Coopersmith +Date: Tue Sep 15 19:17:48 2009 -0700 + + Fix build of unit tests when dtrace probes are enabled + + ar loses the dtrace probe magic when building static libraries, so we + have to link with the .O files in order to resolve the dtrace probe symbols. + + Signed-off-by: Alan Coopersmith + +commit 9fa73be9fa543a686ea35c861084f5af37d44caa Author: Peter Hutterer Date: Tue Sep 22 20:34:54 2009 +1000 @@ -952,9 +1532,8 @@ Date: Tue Sep 22 20:34:54 2009 +1000 Reported-by: Tilman Sauerbeck Signed-off-by: Peter Hutterer - (cherry picked from commit 9fa73be9fa543a686ea35c861084f5af37d44caa) -commit f188fabfe264dfec1950c168e2d9c22f13797b93 +commit a9c274df5c37cb4ece6449e934342d8ff8e61705 Author: Peter Hutterer Date: Wed Sep 23 11:43:27 2009 +1000 @@ -967,9 +1546,8 @@ Date: Wed Sep 23 11:43:27 2009 +1000 kdrive-assigned name. Memory must be freed beforehand. Signed-off-by: Peter Hutterer - (cherry picked from commit a9c274df5c37cb4ece6449e934342d8ff8e61705) -commit 48ab48a6ce12605c7353b45dff4e3a4338b9132e +commit fd913136732ff14a0484ca28f60ac1fbf49be81d Author: Peter Hutterer Date: Wed Sep 23 11:44:12 2009 +1000 @@ -978,9 +1556,8 @@ Date: Wed Sep 23 11:44:12 2009 +1000 'event' must be freed before exiting. Signed-off-by: Peter Hutterer - (cherry picked from commit fd913136732ff14a0484ca28f60ac1fbf49be81d) -commit 9e39491166eb4540bbc72e963e673c976301e936 +commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139 Author: Peter Hutterer Date: Thu Sep 24 14:05:52 2009 +1000 @@ -994,9 +1571,8 @@ Date: Thu Sep 24 14:05:52 2009 +1000 Tested-by: Thomas Jaeger Signed-off-by: Peter Hutterer - (cherry picked from commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139) -commit a9e2f7ac15f426560ac01689ec66f2db32424884 +commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3 Author: Peter Hutterer Date: Wed Sep 23 12:32:44 2009 +1000 @@ -1014,9 +1590,8 @@ Date: Wed Sep 23 12:32:44 2009 +1000 Signed-off-by: Peter Hutterer Acked--by: Daniel Stone - (cherry picked from commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3) -commit 1f74cfdeacb88b466d8f2005af191db30dde2a86 +commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551 Author: Thomas Jaeger Date: Tue Sep 22 20:16:21 2009 -0400 @@ -1024,9 +1599,17 @@ Date: Tue Sep 22 20:16:21 2009 -0400 Signed-off-by: Thomas Jaeger Signed-off-by: Peter Hutterer - (cherry picked from commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551) -commit 8867c60782909816826054ed0587094e58eb39e6 +commit 33bf9cb69dccbb6889b2f83e6db61f40dc644e17 +Author: Jeremy Huddleston +Date: Wed Sep 23 17:41:28 2009 -0700 + + XQuartz: GLX capabilities: Allow 16bit accumulation buffers + + http://xquartz.macosforge.org/trac/ticket/308 + (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22) + +commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec Author: Michel Dänzer Date: Wed Sep 23 13:10:05 2009 +0200 @@ -1036,31 +1619,30 @@ Date: Wed Sep 23 13:10:05 2009 +0200 format can't fit in depth 24. Also fix up a comment for the addition of BGRA formats. - (cherry picked from commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec) -commit ac1490b651a251407e1bbc98e3ccd265a9e491b5 +commit 096f21bb7a1217443d8a03529b1a2938518eb24f Author: Michel Dänzer Date: Wed Sep 23 08:24:06 2009 +0200 EXA: Fix some issues pointed out by clang. Remove dead variables, fix use of uninitialized values, that kind of thing. - (cherry picked from commit 096f21bb7a1217443d8a03529b1a2938518eb24f) -commit 6b656c3498fa1bdbf93b2951b27cc8ff00e65990 +commit 824a09d856a5f750694e11d2fd2faaa3de705eaa Author: Simon Thum Date: Mon Sep 21 15:23:27 2009 +0200 dix: move bounds check before access Signed-off-by: Peter Hutterer - (cherry picked from commit 824a09d856a5f750694e11d2fd2faaa3de705eaa) -commit 9c1a18377afdb919a648a96c4195113121902cfe +commit 9edb9e9b4dde6f73dc5241d078425a7a70699ec9 Author: Peter Hutterer -Date: Tue Sep 22 12:44:19 2009 +1000 +Date: Tue Sep 22 12:56:17 2009 +1000 - xserver 1.6.99.902 (xserver 1.7 RC2) + Bump to 1.7.99.1 + + X Server 1.7 has branched off. Signed-off-by: Peter Hutterer diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index cb98d2c31..a5e07307c 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -51,6 +51,11 @@ endif EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +DISTCHECK_CONFIGURE_FLAGS=\ + --with-xkb-path=$(XKB_BASE_DIRECTORY) \ + --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ + --with-xkb-output='$${datadir}/X11/xkb/compiled' + DISTCLEANFILES = doltcompile doltlibtool MAINTAINERCLEANFILES=ChangeLog diff --git a/xorg-server/Makefile.in b/xorg-server/Makefile.in index 41bb4296f..20ecde527 100644 --- a/xorg-server/Makefile.in +++ b/xorg-server/Makefile.in @@ -36,16 +36,15 @@ build_triplet = @build@ host_triplet = @host@ subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/shave-libtool.in \ - $(srcdir)/shave.in $(srcdir)/xorg-server.pc.in \ - $(top_srcdir)/configure COPYING ChangeLog config.guess \ + $(srcdir)/Makefile.in $(srcdir)/xorg-server.pc.in \ + $(top_srcdir)/configure COPYING ChangeLog compile config.guess \ config.sub depcomp install-sh ltmain.sh missing ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -59,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \ $(top_builddir)/include/xwin-config.h \ $(top_builddir)/include/kdrive-config.h \ $(top_builddir)/include/version-config.h -CONFIG_CLEAN_FILES = shave shave-libtool xorg-server.pc +CONFIG_CLEAN_FILES = xorg-server.pc CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -142,14 +141,12 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -174,7 +171,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -198,6 +194,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -215,8 +212,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -262,7 +257,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -288,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -297,7 +292,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -311,7 +305,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -353,8 +346,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -397,6 +388,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -428,7 +420,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -471,6 +462,11 @@ SUBDIRS = \ @XORG_TRUE@pkgconfigdir = $(libdir)/pkgconfig @XORG_TRUE@pkgconfig_DATA = xorg-server.pc EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +DISTCHECK_CONFIGURE_FLAGS = \ + --with-xkb-path=$(XKB_BASE_DIRECTORY) \ + --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ + --with-xkb-output='$${datadir}/X11/xkb/compiled' + DISTCLEANFILES = doltcompile doltlibtool MAINTAINERCLEANFILES = ChangeLog DIST_SUBDIRS = \ @@ -534,10 +530,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -shave: $(top_builddir)/config.status $(srcdir)/shave.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in - cd $(top_builddir) && $(SHELL) ./config.status $@ xorg-server.pc: $(top_builddir)/config.status $(srcdir)/xorg-server.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am index ac45f955a..7287c4a62 100644 --- a/xorg-server/Xext/Makefile.am +++ b/xorg-server/Xext/Makefile.am @@ -80,7 +80,7 @@ endif # SELinux extension: provides SELinux policy support for X objects # requires X-ACE extension -XSELINUX_SRCS = xselinux.c xselinux.h +XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h if XSELINUX MODULE_SRCS += $(XSELINUX_SRCS) endif @@ -133,6 +133,7 @@ EXTRA_DIST = \ $(SCREENSAVER_SRCS) \ $(XACE_SRCS) \ $(XCSECURITY_SRCS) \ + $(XSELINUX_SRCS) \ $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ $(MULTIBUFFER_SRCS) \ diff --git a/xorg-server/Xext/Makefile.in b/xorg-server/Xext/Makefile.in index e3909ff88..2fb733684 100644 --- a/xorg-server/Xext/Makefile.in +++ b/xorg-server/Xext/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -79,7 +79,8 @@ am__libXext_la_SOURCES_DIST = bigreq.c geext.c shape.c sleepuntil.c \ panoramiXprocs.c panoramiXSwap.c xace.c xace.h xacestr.h \ security.c securitysrv.h xcalibrate.c xf86bigfont.c xvmain.c \ xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h xres.c saver.c \ - xselinux.c xselinux.h mbuf.c dpms.c dpmsproc.h + xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h \ + xselinuxint.h mbuf.c dpms.c dpmsproc.h am__objects_1 = shm.lo @MITSHM_TRUE@am__objects_2 = $(am__objects_1) am__objects_3 = panoramiX.lo panoramiXprocs.lo panoramiXSwap.lo @@ -102,7 +103,7 @@ am__objects_16 = xres.lo @RES_TRUE@am__objects_17 = $(am__objects_16) am__objects_18 = saver.lo @SCREENSAVER_TRUE@am__objects_19 = $(am__objects_18) -am__objects_20 = xselinux.lo +am__objects_20 = xselinux_ext.lo xselinux_hooks.lo xselinux_label.lo @XSELINUX_TRUE@am__objects_21 = $(am__objects_20) am__objects_22 = mbuf.lo @MULTIBUFFER_TRUE@am__objects_23 = $(am__objects_22) @@ -128,8 +129,9 @@ libXextbuiltin_la_OBJECTS = $(am_libXextbuiltin_la_OBJECTS) @XORG_TRUE@am_libXextbuiltin_la_rpath = libXextmodule_la_LIBADD = am__libXextmodule_la_SOURCES_DIST = xvmain.c xvdisp.c xvmc.c xvdix.h \ - xvmcext.h xvdisp.h xres.c saver.c xselinux.c xselinux.h mbuf.c \ - dpms.c dpmsproc.h + xvmcext.h xvdisp.h xres.c saver.c xselinux_ext.c \ + xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h \ + mbuf.c dpms.c dpmsproc.h @XORG_TRUE@am_libXextmodule_la_OBJECTS = $(am__objects_26) libXextmodule_la_OBJECTS = $(am_libXextmodule_la_OBJECTS) @XORG_TRUE@am_libXextmodule_la_rpath = @@ -194,7 +196,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -219,7 +220,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -243,6 +243,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -260,8 +261,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -307,7 +306,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -333,6 +331,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -342,7 +341,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -356,7 +354,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -398,8 +395,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -442,6 +437,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -473,7 +469,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -528,7 +523,7 @@ XACE_SRCS = xace.c xace.h xacestr.h # SELinux extension: provides SELinux policy support for X objects # requires X-ACE extension -XSELINUX_SRCS = xselinux.c xselinux.h +XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h # Security extension: multi-level security to protect clients from each other XCSECURITY_SRCS = security.c securitysrv.h @@ -556,6 +551,7 @@ EXTRA_DIST = \ $(SCREENSAVER_SRCS) \ $(XACE_SRCS) \ $(XCSECURITY_SRCS) \ + $(XSELINUX_SRCS) \ $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ $(MULTIBUFFER_SRCS) \ @@ -639,7 +635,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcmisc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86bigfont.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xres.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_ext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_hooks.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_label.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtest.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvdisp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvmain.Plo@am__quote@ diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index a6f804cd5..8106c40b6 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -99,6 +99,12 @@ typedef struct _ShmDesc { unsigned long size; } ShmDescRec, *ShmDescPtr; +typedef struct _ShmScrPrivateRec { + CloseScreenProcPtr CloseScreen; + ShmFuncsPtr shmFuncs; + DestroyPixmapProcPtr destroyPixmap; +} ShmScrPrivateRec; + static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS); static int ShmDetachSegment( pointer /* value */, @@ -135,13 +141,16 @@ int BadShmSegCode; RESTYPE ShmSegType; static ShmDescPtr Shmsegs; static Bool sharedPixmaps; -static ShmFuncsPtr shmFuncs[MAXSCREENS]; -static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS]; +static DrawablePtr *drawables; +static int shmScrPrivateKeyIndex; +static DevPrivateKey shmScrPrivateKey = &shmScrPrivateKeyIndex; static int shmPixmapPrivateIndex; static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivateIndex; static ShmFuncs miFuncs = {NULL, NULL}; static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL}; +#define ShmGetScreenPriv(s) ((ShmScrPrivateRec *)dixLookupPrivate(&(s)->devPrivates, shmScrPrivateKey)) + #define VERIFY_SHMSEG(shmseg,shmdesc,client) \ { \ int rc; \ @@ -212,6 +221,30 @@ static Bool CheckForShmSyscall(void) #endif +static Bool +ShmCloseScreen(int i, ScreenPtr pScreen) +{ + ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen); + pScreen->CloseScreen = screen_priv->CloseScreen; + dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL); + xfree (screen_priv); + return (*pScreen->CloseScreen) (i, pScreen); +} + +static ShmScrPrivateRec * +ShmInitScreenPriv(ScreenPtr pScreen) +{ + ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen); + if (!screen_priv) + { + screen_priv = xcalloc (1, sizeof (ShmScrPrivateRec)); + screen_priv->CloseScreen = pScreen->CloseScreen; + dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, screen_priv); + pScreen->CloseScreen = ShmCloseScreen; + } + return screen_priv; +} + void ShmExtensionInit(INITARGS) { @@ -226,20 +259,29 @@ ShmExtensionInit(INITARGS) } #endif + drawables = xcalloc(screenInfo.numScreens, sizeof(DrawablePtr)); + if (!drawables) + { + ErrorF("MIT-SHM extension disabled: no memory for per-screen drawables\n"); + return; + } + sharedPixmaps = xFalse; { sharedPixmaps = xTrue; for (i = 0; i < screenInfo.numScreens; i++) { - if (!shmFuncs[i]) - shmFuncs[i] = &miFuncs; - if (!shmFuncs[i]->CreatePixmap) + ShmScrPrivateRec *screen_priv = ShmInitScreenPriv(screenInfo.screens[i]); + if (!screen_priv->shmFuncs) + screen_priv->shmFuncs = &miFuncs; + if (!screen_priv->shmFuncs->CreatePixmap) sharedPixmaps = xFalse; } if (sharedPixmaps) for (i = 0; i < screenInfo.numScreens; i++) { - destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap; + ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(screenInfo.screens[i]); + screen_priv->destroyPixmap = screenInfo.screens[i]->DestroyPixmap; screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap; } } @@ -261,23 +303,21 @@ static void ShmResetProc(ExtensionEntry *extEntry) { int i; - - for (i = 0; i < MAXSCREENS; i++) - { - shmFuncs[i] = NULL; - } + for (i = 0; i < screenInfo.numScreens; i++) + ShmRegisterFuncs(screenInfo.screens[i], NULL); } void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs) { - shmFuncs[pScreen->myNum] = funcs; + ShmInitScreenPriv(pScreen)->shmFuncs = funcs; } static Bool ShmDestroyPixmap (PixmapPtr pPixmap) { ScreenPtr pScreen = pPixmap->drawable.pScreen; + ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen); Bool ret; if (pPixmap->refcnt == 1) { @@ -288,9 +328,9 @@ ShmDestroyPixmap (PixmapPtr pPixmap) ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id); } - pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum]; + pScreen->DestroyPixmap = screen_priv->destroyPixmap; ret = (*pScreen->DestroyPixmap) (pPixmap); - destroyPixmap[pScreen->myNum] = pScreen->DestroyPixmap; + screen_priv->destroyPixmap = pScreen->DestroyPixmap; pScreen->DestroyPixmap = ShmDestroyPixmap; return ret; } @@ -298,7 +338,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap) void ShmRegisterFbFuncs(ScreenPtr pScreen) { - shmFuncs[pScreen->myNum] = &fbFuncs; + ShmRegisterFuncs(pScreen, &fbFuncs); } static int @@ -578,7 +618,6 @@ static int ProcPanoramiXShmGetImage(ClientPtr client) { PanoramiXRes *draw; - DrawablePtr drawables[MAXSCREENS]; DrawablePtr pDraw; xShmGetImageReply xgi; ShmDescPtr shmdesc; @@ -767,9 +806,11 @@ CreatePmap: result = (client->noClientException); FOR_NSCREENS(j) { + ShmScrPrivateRec *screen_priv; pScreen = screenInfo.screens[j]; - pMap = (*shmFuncs[j]->CreatePixmap)(pScreen, + screen_priv = ShmGetScreenPriv(pScreen); + pMap = (*screen_priv->shmFuncs->CreatePixmap)(pScreen, stuff->width, stuff->height, stuff->depth, shmdesc->addr + stuff->offset); @@ -1052,6 +1093,7 @@ ProcShmCreatePixmap(ClientPtr client) DepthPtr pDepth; int i, rc; ShmDescPtr shmdesc; + ShmScrPrivateRec *screen_priv; REQUEST(xShmCreatePixmapReq); unsigned int width, height, depth; unsigned long size; @@ -1100,7 +1142,8 @@ CreatePmap: return BadAlloc; VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( + screen_priv = ShmGetScreenPriv(pDraw->pScreen); + pMap = (*screen_priv->shmFuncs->CreatePixmap)( pDraw->pScreen, stuff->width, stuff->height, stuff->depth, shmdesc->addr + stuff->offset); diff --git a/xorg-server/Xext/xselinux.c b/xorg-server/Xext/xselinux.c deleted file mode 100644 index b9b16b6ce..000000000 --- a/xorg-server/Xext/xselinux.c +++ /dev/null @@ -1,2070 +0,0 @@ -/************************************************************ - -Author: Eamon Walsh - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -this permission notice appear in supporting documentation. This permission -notice shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -********************************************************/ - -/* - * Portions of this code copyright (c) 2005 by Trusted Computer Solutions, Inc. - * All rights reserved. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include -#include -#include - -#include -#include -#include - -#include - -#include -#include "globals.h" -#include "resource.h" -#include "privates.h" -#include "registry.h" -#include "dixstruct.h" -#include "inputstr.h" -#include "windowstr.h" -#include "propertyst.h" -#include "extnsionst.h" -#include "scrnintstr.h" -#include "selection.h" -#include "xacestr.h" -#define _XSELINUX_NEED_FLASK -#include "xselinux.h" -#include "../os/osdep.h" -#include "modinit.h" - - -/* - * Globals - */ - -/* private state keys */ -static int subjectKeyIndex; -static DevPrivateKey subjectKey = &subjectKeyIndex; -static int objectKeyIndex; -static DevPrivateKey objectKey = &objectKeyIndex; -static int dataKeyIndex; -static DevPrivateKey dataKey = &dataKeyIndex; - -/* subject state (clients and devices only) */ -typedef struct { - security_id_t sid; - security_id_t dev_create_sid; - security_id_t win_create_sid; - security_id_t sel_create_sid; - security_id_t prp_create_sid; - security_id_t sel_use_sid; - security_id_t prp_use_sid; - struct avc_entry_ref aeref; - char *command; - int privileged; -} SELinuxSubjectRec; - -/* object state */ -typedef struct { - security_id_t sid; - int poly; -} SELinuxObjectRec; - -/* selection and property atom cache */ -typedef struct { - SELinuxObjectRec prp; - SELinuxObjectRec sel; -} SELinuxAtomRec; - -/* audit file descriptor */ -static int audit_fd; - -/* structure passed to auditing callback */ -typedef struct { - ClientPtr client; /* client */ - DeviceIntPtr dev; /* device */ - char *command; /* client's executable path */ - unsigned id; /* resource id, if any */ - int restype; /* resource type, if any */ - int event; /* event type, if any */ - Atom property; /* property name, if any */ - Atom selection; /* selection name, if any */ - char *extension; /* extension name, if any */ -} SELinuxAuditRec; - -/* labeling handle */ -static struct selabel_handle *label_hnd; - -/* whether AVC is active */ -static int avc_active; - -/* atoms for window label properties */ -static Atom atom_ctx; -static Atom atom_client_ctx; - -/* The unlabeled SID */ -static security_id_t unlabeled_sid; - -/* Array of object classes indexed by resource type */ -static security_class_t *knownTypes; -static unsigned numKnownTypes; - -/* Array of event SIDs indexed by event type */ -static security_id_t *knownEvents; -static unsigned numKnownEvents; - -/* Array of property and selection SID structures */ -static SELinuxAtomRec *knownAtoms; -static unsigned numKnownAtoms; - -/* forward declarations */ -static void SELinuxScreen(CallbackListPtr *, pointer, pointer); - -/* "true" pointer value for use as callback data */ -static pointer truep = (pointer)1; - - -/* - * Support Routines - */ - -/* - * Looks up a name in the selection or property mappings - */ -static int -SELinuxAtomToSIDLookup(Atom atom, SELinuxObjectRec *obj, int map, int polymap) -{ - const char *name = NameForAtom(atom); - security_context_t ctx; - int rc = Success; - - obj->poly = 1; - - /* Look in the mappings of names to contexts */ - if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) { - obj->poly = 0; - } else if (errno != ENOENT) { - ErrorF("SELinux: a property label lookup failed!\n"); - return BadValue; - } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) { - ErrorF("SELinux: a property label lookup failed!\n"); - return BadValue; - } - - /* Get a SID for context */ - if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) { - ErrorF("SELinux: a context_to_SID_raw call failed!\n"); - rc = BadAlloc; - } - - freecon(ctx); - return rc; -} - -/* - * Looks up the SID corresponding to the given property or selection atom - */ -static int -SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn) -{ - SELinuxObjectRec *obj; - int rc, map, polymap; - - if (atom >= numKnownAtoms) { - /* Need to increase size of atoms array */ - unsigned size = sizeof(SELinuxAtomRec); - knownAtoms = xrealloc(knownAtoms, (atom + 1) * size); - if (!knownAtoms) - return BadAlloc; - memset(knownAtoms + numKnownAtoms, 0, - (atom - numKnownAtoms + 1) * size); - numKnownAtoms = atom + 1; - } - - if (prop) { - obj = &knownAtoms[atom].prp; - map = SELABEL_X_PROP; - polymap = SELABEL_X_POLYPROP; - } else { - obj = &knownAtoms[atom].sel; - map = SELABEL_X_SELN; - polymap = SELABEL_X_POLYSELN; - } - - if (!obj->sid) { - rc = SELinuxAtomToSIDLookup(atom, obj, map, polymap); - if (rc != Success) - goto out; - } - - *obj_rtn = obj; - rc = Success; -out: - return rc; -} - -/* - * Looks up a SID for a selection/subject pair - */ -static int -SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj, - security_id_t *sid_rtn, int *poly_rtn) -{ - int rc; - SELinuxObjectRec *obj; - security_id_t tsid; - - /* Get the default context and polyinstantiation bit */ - rc = SELinuxAtomToSID(selection, 0, &obj); - if (rc != Success) - return rc; - - /* Check for an override context next */ - if (subj->sel_use_sid) { - sidget(tsid = subj->sel_use_sid); - goto out; - } - - sidget(tsid = obj->sid); - - /* Polyinstantiate if necessary to obtain the final SID */ - if (obj->poly) { - sidput(tsid); - if (avc_compute_member(subj->sid, obj->sid, - SECCLASS_X_SELECTION, &tsid) < 0) { - ErrorF("SELinux: a compute_member call failed!\n"); - return BadValue; - } - } -out: - *sid_rtn = tsid; - if (poly_rtn) - *poly_rtn = obj->poly; - return Success; -} - -/* - * Looks up a SID for a property/subject pair - */ -static int -SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj, - security_id_t *sid_rtn, int *poly_rtn) -{ - int rc; - SELinuxObjectRec *obj; - security_id_t tsid, tsid2; - - /* Get the default context and polyinstantiation bit */ - rc = SELinuxAtomToSID(property, 1, &obj); - if (rc != Success) - return rc; - - /* Check for an override context next */ - if (subj->prp_use_sid) { - sidget(tsid = subj->prp_use_sid); - goto out; - } - - /* Perform a transition */ - if (avc_compute_create(subj->sid, obj->sid, - SECCLASS_X_PROPERTY, &tsid) < 0) { - ErrorF("SELinux: a compute_create call failed!\n"); - return BadValue; - } - - /* Polyinstantiate if necessary to obtain the final SID */ - if (obj->poly) { - tsid2 = tsid; - if (avc_compute_member(subj->sid, tsid2, - SECCLASS_X_PROPERTY, &tsid) < 0) { - ErrorF("SELinux: a compute_member call failed!\n"); - sidput(tsid2); - return BadValue; - } - sidput(tsid2); - } -out: - *sid_rtn = tsid; - if (poly_rtn) - *poly_rtn = obj->poly; - return Success; -} - -/* - * Looks up the SID corresponding to the given event type - */ -static int -SELinuxEventToSID(unsigned type, security_id_t sid_of_window, - SELinuxObjectRec *sid_return) -{ - const char *name = LookupEventName(type); - security_context_t ctx; - type &= 127; - - if (type >= numKnownEvents) { - /* Need to increase size of classes array */ - unsigned size = sizeof(security_id_t); - knownEvents = xrealloc(knownEvents, (type + 1) * size); - if (!knownEvents) - return BadAlloc; - memset(knownEvents + numKnownEvents, 0, - (type - numKnownEvents + 1) * size); - numKnownEvents = type + 1; - } - - if (!knownEvents[type]) { - /* Look in the mappings of event names to contexts */ - if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) { - ErrorF("SELinux: an event label lookup failed!\n"); - return BadValue; - } - /* Get a SID for context */ - if (avc_context_to_sid_raw(ctx, knownEvents + type) < 0) { - ErrorF("SELinux: a context_to_SID_raw call failed!\n"); - return BadAlloc; - } - freecon(ctx); - } - - /* Perform a transition to obtain the final SID */ - if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT, - &sid_return->sid) < 0) { - ErrorF("SELinux: a compute_create call failed!\n"); - return BadValue; - } - - return Success; -} - -/* - * Returns the object class corresponding to the given resource type. - */ -static security_class_t -SELinuxTypeToClass(RESTYPE type) -{ - RESTYPE fulltype = type; - type &= TypeMask; - - if (type >= numKnownTypes) { - /* Need to increase size of classes array */ - unsigned size = sizeof(security_class_t); - knownTypes = xrealloc(knownTypes, (type + 1) * size); - if (!knownTypes) - return 0; - memset(knownTypes + numKnownTypes, 0, - (type - numKnownTypes + 1) * size); - numKnownTypes = type + 1; - } - - if (!knownTypes[type]) { - const char *str; - knownTypes[type] = SECCLASS_X_RESOURCE; - - if (fulltype & RC_DRAWABLE) - knownTypes[type] = SECCLASS_X_DRAWABLE; - if (fulltype == RT_GC) - knownTypes[type] = SECCLASS_X_GC; - if (fulltype == RT_FONT) - knownTypes[type] = SECCLASS_X_FONT; - if (fulltype == RT_CURSOR) - knownTypes[type] = SECCLASS_X_CURSOR; - if (fulltype == RT_COLORMAP) - knownTypes[type] = SECCLASS_X_COLORMAP; - - /* Need to do a string lookup */ - str = LookupResourceName(fulltype); - if (!strcmp(str, "PICTURE")) - knownTypes[type] = SECCLASS_X_DRAWABLE; - if (!strcmp(str, "GLYPHSET")) - knownTypes[type] = SECCLASS_X_FONT; - } - - return knownTypes[type]; -} - -/* - * Performs an SELinux permission check. - */ -static int -SELinuxDoCheck(SELinuxSubjectRec *subj, SELinuxObjectRec *obj, - security_class_t class, Mask mode, SELinuxAuditRec *auditdata) -{ - /* serverClient requests OK */ - if (subj->privileged) - return Success; - - auditdata->command = subj->command; - errno = 0; - - if (avc_has_perm(subj->sid, obj->sid, class, mode, &subj->aeref, - auditdata) < 0) { - if (mode == DixUnknownAccess) - return Success; /* DixUnknownAccess requests OK ... for now */ - if (errno == EACCES) - return BadAccess; - ErrorF("SELinux: avc_has_perm: unexpected error %d\n", errno); - return BadValue; - } - - return Success; -} - -/* - * Labels a newly connected client. - */ -static void -SELinuxLabelClient(ClientPtr client) -{ - int fd = XaceGetConnectionNumber(client); - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - security_context_t ctx; - - subj = dixLookupPrivate(&client->devPrivates, subjectKey); - sidput(subj->sid); - obj = dixLookupPrivate(&client->devPrivates, objectKey); - sidput(obj->sid); - - /* Try to get a context from the socket */ - if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) { - /* Otherwise, fall back to a default context */ - if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0) - FatalError("SELinux: failed to look up remote-client context\n"); - } - - /* For local clients, try and determine the executable name */ - if (XaceIsLocal(client)) { - struct ucred creds; - socklen_t len = sizeof(creds); - char path[PATH_MAX + 1]; - size_t bytes; - - memset(&creds, 0, sizeof(creds)); - if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0) - goto finish; - - snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid); - fd = open(path, O_RDONLY); - if (fd < 0) - goto finish; - - bytes = read(fd, path, PATH_MAX + 1); - close(fd); - if (bytes <= 0) - goto finish; - - subj->command = xalloc(bytes); - if (!subj->command) - goto finish; - - memcpy(subj->command, path, bytes); - subj->command[bytes - 1] = 0; - } - -finish: - /* Get a SID from the context */ - if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) - FatalError("SELinux: client %d: context_to_sid_raw(%s) failed\n", - client->index, ctx); - - sidget(obj->sid = subj->sid); - freecon(ctx); -} - -/* - * Labels initial server objects. - */ -static void -SELinuxLabelInitial(void) -{ - int i; - XaceScreenAccessRec srec; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - security_context_t ctx; - pointer unused; - - /* Do the serverClient */ - subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey); - obj = dixLookupPrivate(&serverClient->devPrivates, objectKey); - subj->privileged = 1; - sidput(subj->sid); - - /* Use the context of the X server process for the serverClient */ - if (getcon_raw(&ctx) < 0) - FatalError("SELinux: couldn't get context of X server process\n"); - - /* Get a SID from the context */ - if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) - FatalError("SELinux: serverClient: context_to_sid(%s) failed\n", ctx); - - sidget(obj->sid = subj->sid); - freecon(ctx); - - srec.client = serverClient; - srec.access_mode = DixCreateAccess; - srec.status = Success; - - for (i = 0; i < screenInfo.numScreens; i++) { - /* Do the screen object */ - srec.screen = screenInfo.screens[i]; - SELinuxScreen(NULL, NULL, &srec); - - /* Do the default colormap */ - dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap, - RT_COLORMAP, serverClient, DixCreateAccess); - } -} - -/* - * Labels new resource objects. - */ -static int -SELinuxLabelResource(XaceResourceAccessRec *rec, SELinuxSubjectRec *subj, - SELinuxObjectRec *obj, security_class_t class) -{ - int offset; - security_id_t tsid; - - /* Check for a create context */ - if (rec->rtype == RT_WINDOW && subj->win_create_sid) { - sidget(obj->sid = subj->win_create_sid); - return Success; - } - - if (rec->parent) - offset = dixLookupPrivateOffset(rec->ptype); - - if (rec->parent && offset >= 0) { - /* Use the SID of the parent object in the labeling operation */ - PrivateRec **privatePtr = DEVPRIV_AT(rec->parent, offset); - SELinuxObjectRec *pobj = dixLookupPrivate(privatePtr, objectKey); - tsid = pobj->sid; - } else { - /* Use the SID of the subject */ - tsid = subj->sid; - } - - /* Perform a transition to obtain the final SID */ - if (avc_compute_create(subj->sid, tsid, class, &obj->sid) < 0) { - ErrorF("SELinux: a compute_create call failed!\n"); - return BadValue; - } - - return Success; -} - - -/* - * Libselinux Callbacks - */ - -static int -SELinuxAudit(void *auditdata, - security_class_t class, - char *msgbuf, - size_t msgbufsize) -{ - SELinuxAuditRec *audit = auditdata; - ClientPtr client = audit->client; - char idNum[16]; - const char *propertyName, *selectionName; - int major = -1, minor = -1; - - if (client) { - REQUEST(xReq); - if (stuff) { - major = stuff->reqType; - minor = MinorOpcodeOfRequest(client); - } - } - if (audit->id) - snprintf(idNum, 16, "%x", audit->id); - - propertyName = audit->property ? NameForAtom(audit->property) : NULL; - selectionName = audit->selection ? NameForAtom(audit->selection) : NULL; - - return snprintf(msgbuf, msgbufsize, - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", - (major >= 0) ? "request=" : "", - (major >= 0) ? LookupRequestName(major, minor) : "", - audit->command ? " comm=" : "", - audit->command ? audit->command : "", - audit->dev ? " xdevice=\"" : "", - audit->dev ? audit->dev->name : "", - audit->dev ? "\"" : "", - audit->id ? " resid=" : "", - audit->id ? idNum : "", - audit->restype ? " restype=" : "", - audit->restype ? LookupResourceName(audit->restype) : "", - audit->event ? " event=" : "", - audit->event ? LookupEventName(audit->event & 127) : "", - audit->property ? " property=" : "", - audit->property ? propertyName : "", - audit->selection ? " selection=" : "", - audit->selection ? selectionName : "", - audit->extension ? " extension=" : "", - audit->extension ? audit->extension : ""); -} - -static int -SELinuxLog(int type, const char *fmt, ...) -{ - va_list ap; - char buf[MAX_AUDIT_MESSAGE_LENGTH]; - int rc, aut; - - switch (type) { - case SELINUX_INFO: - aut = AUDIT_USER_MAC_POLICY_LOAD; - break; - case SELINUX_AVC: - aut = AUDIT_USER_AVC; - break; - default: - aut = AUDIT_USER_SELINUX_ERR; - break; - } - - va_start(ap, fmt); - vsnprintf(buf, MAX_AUDIT_MESSAGE_LENGTH, fmt, ap); - rc = audit_log_user_avc_message(audit_fd, aut, buf, NULL, NULL, NULL, 0); - va_end(ap); - LogMessageVerb(X_WARNING, 0, "%s", buf); - return 0; -} - -/* - * XACE Callbacks - */ - -static void -SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceDeviceAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev }; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->dev->devPrivates, objectKey); - - /* If this is a new object that needs labeling, do it now */ - if (rec->access_mode & DixCreateAccess) { - SELinuxSubjectRec *dsubj; - dsubj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey); - - sidput(dsubj->sid); - sidput(obj->sid); - - if (subj->dev_create_sid) { - /* Label the device with the create context */ - sidget(obj->sid = subj->dev_create_sid); - sidget(dsubj->sid = subj->dev_create_sid); - } else { - /* Label the device directly with the process SID */ - sidget(obj->sid = subj->sid); - sidget(dsubj->sid = subj->sid); - } - } - - /* XXX only check read permission on XQueryKeymap */ - /* This is to allow the numerous apps that call XQueryPointer to work */ - if (rec->access_mode & DixReadAccess) { - ClientPtr client = rec->client; - REQUEST(xReq); - if (stuff && stuff->reqType != X_QueryKeymap) { - rec->access_mode &= ~DixReadAccess; - rec->access_mode |= DixGetAttrAccess; - } - } - - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; -} - -static void -SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceSendAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj, ev_sid; - SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev }; - security_class_t class; - int rc, i, type; - - if (rec->dev) - subj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey); - else - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - - obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey); - - /* Check send permission on window */ - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixSendAccess, - &auditdata); - if (rc != Success) - goto err; - - /* Check send permission on specific event types */ - for (i = 0; i < rec->count; i++) { - type = rec->events[i].u.u.type; - class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT; - - rc = SELinuxEventToSID(type, obj->sid, &ev_sid); - if (rc != Success) - goto err; - - auditdata.event = type; - rc = SELinuxDoCheck(subj, &ev_sid, class, DixSendAccess, &auditdata); - if (rc != Success) - goto err; - } - return; -err: - rec->status = rc; -} - -static void -SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceReceiveAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj, ev_sid; - SELinuxAuditRec auditdata = { .client = NULL }; - security_class_t class; - int rc, i, type; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey); - - /* Check receive permission on window */ - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixReceiveAccess, - &auditdata); - if (rc != Success) - goto err; - - /* Check receive permission on specific event types */ - for (i = 0; i < rec->count; i++) { - type = rec->events[i].u.u.type; - class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT; - - rc = SELinuxEventToSID(type, obj->sid, &ev_sid); - if (rc != Success) - goto err; - - auditdata.event = type; - rc = SELinuxDoCheck(subj, &ev_sid, class, DixReceiveAccess, &auditdata); - if (rc != Success) - goto err; - } - return; -err: - rec->status = rc; -} - -static void -SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceExtAccessRec *rec = calldata; - SELinuxSubjectRec *subj, *serv; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client }; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->ext->devPrivates, objectKey); - - /* If this is a new object that needs labeling, do it now */ - /* XXX there should be a separate callback for this */ - if (obj->sid == unlabeled_sid) { - const char *name = rec->ext->name; - security_context_t ctx; - security_id_t sid; - - serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey); - - /* Look in the mappings of extension names to contexts */ - if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) { - ErrorF("SELinux: a property label lookup failed!\n"); - rec->status = BadValue; - return; - } - /* Get a SID for context */ - if (avc_context_to_sid_raw(ctx, &sid) < 0) { - ErrorF("SELinux: a context_to_SID_raw call failed!\n"); - rec->status = BadAlloc; - return; - } - - sidput(obj->sid); - - /* Perform a transition to obtain the final SID */ - if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION, - &obj->sid) < 0) { - ErrorF("SELinux: a SID transition call failed!\n"); - freecon(ctx); - rec->status = BadValue; - return; - } - freecon(ctx); - } - - /* Perform the security check */ - auditdata.extension = rec->ext->name; - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_EXTENSION, rec->access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; -} - -static void -SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceSelectionAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj, *data; - Selection *pSel = *rec->ppSel; - Atom name = pSel->selection; - Mask access_mode = rec->access_mode; - SELinuxAuditRec auditdata = { .client = rec->client, .selection = name }; - security_id_t tsid; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&pSel->devPrivates, objectKey); - - /* If this is a new object that needs labeling, do it now */ - if (access_mode & DixCreateAccess) { - sidput(obj->sid); - rc = SELinuxSelectionToSID(name, subj, &obj->sid, &obj->poly); - if (rc != Success) - obj->sid = unlabeled_sid; - access_mode = DixSetAttrAccess; - } - /* If this is a polyinstantiated object, find the right instance */ - else if (obj->poly) { - rc = SELinuxSelectionToSID(name, subj, &tsid, NULL); - if (rc != Success) { - rec->status = rc; - return; - } - while (pSel->selection != name || obj->sid != tsid) { - if ((pSel = pSel->next) == NULL) - break; - obj = dixLookupPrivate(&pSel->devPrivates, objectKey); - } - sidput(tsid); - - if (pSel) - *rec->ppSel = pSel; - else { - rec->status = BadMatch; - return; - } - } - - /* Perform the security check */ - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; - - /* Label the content (advisory only) */ - if (access_mode & DixSetAttrAccess) { - data = dixLookupPrivate(&pSel->devPrivates, dataKey); - sidput(data->sid); - if (subj->sel_create_sid) - sidget(data->sid = subj->sel_create_sid); - else - sidget(data->sid = obj->sid); - } -} - -static void -SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XacePropertyAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj, *data; - PropertyPtr pProp = *rec->ppProp; - Atom name = pProp->propertyName; - SELinuxAuditRec auditdata = { .client = rec->client, .property = name }; - security_id_t tsid; - int rc; - - /* Don't care about the new content check */ - if (rec->access_mode & DixPostAccess) - return; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&pProp->devPrivates, objectKey); - - /* If this is a new object that needs labeling, do it now */ - if (rec->access_mode & DixCreateAccess) { - sidput(obj->sid); - rc = SELinuxPropertyToSID(name, subj, &obj->sid, &obj->poly); - if (rc != Success) { - rec->status = rc; - return; - } - } - /* If this is a polyinstantiated object, find the right instance */ - else if (obj->poly) { - rc = SELinuxPropertyToSID(name, subj, &tsid, NULL); - if (rc != Success) { - rec->status = rc; - return; - } - while (pProp->propertyName != name || obj->sid != tsid) { - if ((pProp = pProp->next) == NULL) - break; - obj = dixLookupPrivate(&pProp->devPrivates, objectKey); - } - sidput(tsid); - - if (pProp) - *rec->ppProp = pProp; - else { - rec->status = BadMatch; - return; - } - } - - /* Perform the security check */ - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_PROPERTY, rec->access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; - - /* Label the content (advisory only) */ - if (rec->access_mode & DixWriteAccess) { - data = dixLookupPrivate(&pProp->devPrivates, dataKey); - sidput(data->sid); - if (subj->prp_create_sid) - sidget(data->sid = subj->prp_create_sid); - else - sidget(data->sid = obj->sid); - } -} - -static void -SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceResourceAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client }; - Mask access_mode = rec->access_mode; - PrivateRec **privatePtr; - security_class_t class; - int rc, offset; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - - /* Determine if the resource object has a devPrivates field */ - offset = dixLookupPrivateOffset(rec->rtype); - if (offset < 0) { - /* No: use the SID of the owning client */ - class = SECCLASS_X_RESOURCE; - privatePtr = &clients[CLIENT_ID(rec->id)]->devPrivates; - obj = dixLookupPrivate(privatePtr, objectKey); - } else { - /* Yes: use the SID from the resource object itself */ - class = SELinuxTypeToClass(rec->rtype); - privatePtr = DEVPRIV_AT(rec->res, offset); - obj = dixLookupPrivate(privatePtr, objectKey); - } - - /* If this is a new object that needs labeling, do it now */ - if (access_mode & DixCreateAccess && offset >= 0) { - rc = SELinuxLabelResource(rec, subj, obj, class); - if (rc != Success) { - rec->status = rc; - return; - } - } - - /* Collapse generic resource permissions down to read/write */ - if (class == SECCLASS_X_RESOURCE) { - access_mode = !!(rec->access_mode & SELinuxReadMask); /* rd */ - access_mode |= !!(rec->access_mode & ~SELinuxReadMask) << 1; /* wr */ - } - - /* Perform the security check */ - auditdata.restype = rec->rtype; - auditdata.id = rec->id; - rc = SELinuxDoCheck(subj, obj, class, access_mode, &auditdata); - if (rc != Success) - rec->status = rc; - - /* Perform the background none check on windows */ - if (access_mode & DixCreateAccess && rec->rtype == RT_WINDOW) { - rc = SELinuxDoCheck(subj, obj, class, DixBlendAccess, &auditdata); - if (rc != Success) - ((WindowPtr)rec->res)->forcedBG = TRUE; - } -} - -static void -SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata) -{ - XaceScreenAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client }; - Mask access_mode = rec->access_mode; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->screen->devPrivates, objectKey); - - /* If this is a new object that needs labeling, do it now */ - if (access_mode & DixCreateAccess) { - sidput(obj->sid); - - /* Perform a transition to obtain the final SID */ - if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN, - &obj->sid) < 0) { - ErrorF("SELinux: a compute_create call failed!\n"); - rec->status = BadValue; - return; - } - } - - if (is_saver) - access_mode <<= 2; - - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SCREEN, access_mode, &auditdata); - if (rc != Success) - rec->status = rc; -} - -static void -SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceClientAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client }; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&rec->target->devPrivates, objectKey); - - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_CLIENT, rec->access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; -} - -static void -SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - XaceServerAccessRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - SELinuxAuditRec auditdata = { .client = rec->client }; - int rc; - - subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); - obj = dixLookupPrivate(&serverClient->devPrivates, objectKey); - - rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SERVER, rec->access_mode, - &auditdata); - if (rc != Success) - rec->status = rc; -} - - -/* - * DIX Callbacks - */ - -static void -SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - NewClientInfoRec *pci = calldata; - - switch (pci->client->clientState) { - case ClientStateInitial: - SELinuxLabelClient(pci->client); - break; - - default: - break; - } -} - -static void -SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - ResourceStateInfoRec *rec = calldata; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - WindowPtr pWin; - - if (rec->type != RT_WINDOW) - return; - if (rec->state != ResourceStateAdding) - return; - - pWin = (WindowPtr)rec->value; - subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey); - - if (subj->sid) { - security_context_t ctx; - int rc = avc_sid_to_context_raw(subj->sid, &ctx); - if (rc < 0) - FatalError("SELinux: Failed to get security context!\n"); - rc = dixChangeWindowProperty(serverClient, - pWin, atom_client_ctx, XA_STRING, 8, - PropModeReplace, strlen(ctx), ctx, FALSE); - if (rc != Success) - FatalError("SELinux: Failed to set label property on window!\n"); - freecon(ctx); - } else - FatalError("SELinux: Unexpected unlabeled client found\n"); - - obj = dixLookupPrivate(&pWin->devPrivates, objectKey); - - if (obj->sid) { - security_context_t ctx; - int rc = avc_sid_to_context_raw(obj->sid, &ctx); - if (rc < 0) - FatalError("SELinux: Failed to get security context!\n"); - rc = dixChangeWindowProperty(serverClient, - pWin, atom_ctx, XA_STRING, 8, - PropModeReplace, strlen(ctx), ctx, FALSE); - if (rc != Success) - FatalError("SELinux: Failed to set label property on window!\n"); - freecon(ctx); - } else - FatalError("SELinux: Unexpected unlabeled window found\n"); -} - - -/* - * DevPrivates Callbacks - */ - -static void -SELinuxSubjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - PrivateCallbackRec *rec = calldata; - SELinuxSubjectRec *subj = *rec->value; - - sidget(unlabeled_sid); - subj->sid = unlabeled_sid; - - avc_entry_ref_init(&subj->aeref); -} - -static void -SELinuxSubjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - PrivateCallbackRec *rec = calldata; - SELinuxSubjectRec *subj = *rec->value; - - xfree(subj->command); - - if (avc_active) { - sidput(subj->sid); - sidput(subj->dev_create_sid); - sidput(subj->win_create_sid); - sidput(subj->sel_create_sid); - sidput(subj->prp_create_sid); - } -} - -static void -SELinuxObjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - PrivateCallbackRec *rec = calldata; - SELinuxObjectRec *obj = *rec->value; - - sidget(unlabeled_sid); - obj->sid = unlabeled_sid; -} - -static void -SELinuxObjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata) -{ - PrivateCallbackRec *rec = calldata; - SELinuxObjectRec *obj = *rec->value; - - if (avc_active) - sidput(obj->sid); -} - - -/* - * Extension Dispatch - */ - -#define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid) -#define CTX_WIN offsetof(SELinuxSubjectRec, win_create_sid) -#define CTX_PRP offsetof(SELinuxSubjectRec, prp_create_sid) -#define CTX_SEL offsetof(SELinuxSubjectRec, sel_create_sid) -#define USE_PRP offsetof(SELinuxSubjectRec, prp_use_sid) -#define USE_SEL offsetof(SELinuxSubjectRec, sel_use_sid) - -typedef struct { - security_context_t octx; - security_context_t dctx; - CARD32 octx_len; - CARD32 dctx_len; - CARD32 id; -} SELinuxListItemRec; - -static security_context_t -SELinuxCopyContext(char *ptr, unsigned len) -{ - security_context_t copy = xalloc(len + 1); - if (!copy) - return NULL; - strncpy(copy, ptr, len); - copy[len] = '\0'; - return copy; -} - -static int -ProcSELinuxQueryVersion(ClientPtr client) -{ - SELinuxQueryVersionReply rep; - - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.server_major = SELINUX_MAJOR_VERSION; - rep.server_minor = SELINUX_MINOR_VERSION; - if (client->swapped) { - int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swaps(&rep.server_major, n); - swaps(&rep.server_minor, n); - } - WriteToClient(client, sizeof(rep), (char *)&rep); - return (client->noClientException); -} - -static int -SELinuxSendContextReply(ClientPtr client, security_id_t sid) -{ - SELinuxGetContextReply rep; - security_context_t ctx = NULL; - int len = 0; - - if (sid) { - if (avc_sid_to_context_raw(sid, &ctx) < 0) - return BadValue; - len = strlen(ctx) + 1; - } - - rep.type = X_Reply; - rep.length = bytes_to_int32(len); - rep.sequenceNumber = client->sequence; - rep.context_len = len; - - if (client->swapped) { - int n; - swapl(&rep.length, n); - swaps(&rep.sequenceNumber, n); - swapl(&rep.context_len, n); - } - - WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep); - WriteToClient(client, len, ctx); - freecon(ctx); - return client->noClientException; -} - -static int -ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) -{ - PrivateRec **privPtr = &client->devPrivates; - security_id_t *pSid; - security_context_t ctx = NULL; - char *ptr; - int rc; - - REQUEST(SELinuxSetCreateContextReq); - REQUEST_FIXED_SIZE(SELinuxSetCreateContextReq, stuff->context_len); - - if (stuff->context_len > 0) { - ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len); - if (!ctx) - return BadAlloc; - } - - ptr = dixLookupPrivate(privPtr, subjectKey); - pSid = (security_id_t *)(ptr + offset); - sidput(*pSid); - *pSid = NULL; - - rc = Success; - if (stuff->context_len > 0) { - if (security_check_context_raw(ctx) < 0 || - avc_context_to_sid_raw(ctx, pSid) < 0) - rc = BadValue; - } - - xfree(ctx); - return rc; -} - -static int -ProcSELinuxGetCreateContext(ClientPtr client, unsigned offset) -{ - security_id_t *pSid; - char *ptr; - - REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq); - - if (offset == CTX_DEV) - ptr = dixLookupPrivate(&serverClient->devPrivates, subjectKey); - else - ptr = dixLookupPrivate(&client->devPrivates, subjectKey); - - pSid = (security_id_t *)(ptr + offset); - return SELinuxSendContextReply(client, *pSid); -} - -static int -ProcSELinuxSetDeviceContext(ClientPtr client) -{ - security_context_t ctx; - security_id_t sid; - DeviceIntPtr dev; - SELinuxSubjectRec *subj; - SELinuxObjectRec *obj; - int rc; - - REQUEST(SELinuxSetContextReq); - REQUEST_FIXED_SIZE(SELinuxSetContextReq, stuff->context_len); - - if (stuff->context_len < 1) - return BadLength; - ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len); - if (!ctx) - return BadAlloc; - - rc = dixLookupDevice(&dev, stuff->id, client, DixManageAccess); - if (rc != Success) - goto out; - - if (security_check_context_raw(ctx) < 0 || - avc_context_to_sid_raw(ctx, &sid) < 0) { - rc = BadValue; - goto out; - } - - subj = dixLookupPrivate(&dev->devPrivates, subjectKey); - sidput(subj->sid); - subj->sid = sid; - obj = dixLookupPrivate(&dev->devPrivates, objectKey); - sidput(obj->sid); - sidget(obj->sid = sid); - - rc = Success; -out: - xfree(ctx); - return rc; -} - -static int -ProcSELinuxGetDeviceContext(ClientPtr client) -{ - DeviceIntPtr dev; - SELinuxSubjectRec *subj; - int rc; - - REQUEST(SELinuxGetContextReq); - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - - rc = dixLookupDevice(&dev, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - subj = dixLookupPrivate(&dev->devPrivates, subjectKey); - return SELinuxSendContextReply(client, subj->sid); -} - -static int -ProcSELinuxGetWindowContext(ClientPtr client) -{ - WindowPtr pWin; - SELinuxObjectRec *obj; - int rc; - - REQUEST(SELinuxGetContextReq); - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - - rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - obj = dixLookupPrivate(&pWin->devPrivates, objectKey); - return SELinuxSendContextReply(client, obj->sid); -} - -static int -ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) -{ - WindowPtr pWin; - PropertyPtr pProp; - SELinuxObjectRec *obj; - int rc; - - REQUEST(SELinuxGetPropertyContextReq); - REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq); - - rc = dixLookupWindow(&pWin, stuff->window, client, DixGetPropAccess); - if (rc != Success) - return rc; - - rc = dixLookupProperty(&pProp, pWin, stuff->property, client, - DixGetAttrAccess); - if (rc != Success) - return rc; - - obj = dixLookupPrivate(&pProp->devPrivates, privKey); - return SELinuxSendContextReply(client, obj->sid); -} - -static int -ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) -{ - Selection *pSel; - SELinuxObjectRec *obj; - int rc; - - REQUEST(SELinuxGetContextReq); - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - - rc = dixLookupSelection(&pSel, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - obj = dixLookupPrivate(&pSel->devPrivates, privKey); - return SELinuxSendContextReply(client, obj->sid); -} - -static int -ProcSELinuxGetClientContext(ClientPtr client) -{ - ClientPtr target; - SELinuxSubjectRec *subj; - int rc; - - REQUEST(SELinuxGetContextReq); - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - - rc = dixLookupClient(&target, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - subj = dixLookupPrivate(&target->devPrivates, subjectKey); - return SELinuxSendContextReply(client, subj->sid); -} - -static int -SELinuxPopulateItem(SELinuxListItemRec *i, PrivateRec **privPtr, CARD32 id, - int *size) -{ - SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey); - SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey); - - if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0) - return BadValue; - if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0) - return BadValue; - - i->id = id; - i->octx_len = bytes_to_int32(strlen(i->octx) + 1); - i->dctx_len = bytes_to_int32(strlen(i->dctx) + 1); - - *size += i->octx_len + i->dctx_len + 3; - return Success; -} - -static void -SELinuxFreeItems(SELinuxListItemRec *items, int count) -{ - int k; - for (k = 0; k < count; k++) { - freecon(items[k].octx); - freecon(items[k].dctx); - } - xfree(items); -} - -static int -SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items, - int size, int count) -{ - int rc, k, n, pos = 0; - SELinuxListItemsReply rep; - CARD32 *buf; - - buf = xcalloc(size, sizeof(CARD32)); - if (size && !buf) { - rc = BadAlloc; - goto out; - } - - /* Fill in the buffer */ - for (k = 0; k < count; k++) { - buf[pos] = items[k].id; - if (client->swapped) - swapl(buf + pos, n); - pos++; - - buf[pos] = items[k].octx_len * 4; - if (client->swapped) - swapl(buf + pos, n); - pos++; - - buf[pos] = items[k].dctx_len * 4; - if (client->swapped) - swapl(buf + pos, n); - pos++; - - memcpy((char *)(buf + pos), items[k].octx, strlen(items[k].octx) + 1); - pos += items[k].octx_len; - memcpy((char *)(buf + pos), items[k].dctx, strlen(items[k].dctx) + 1); - pos += items[k].dctx_len; - } - - /* Send reply to client */ - rep.type = X_Reply; - rep.length = size; - rep.sequenceNumber = client->sequence; - rep.count = count; - - if (client->swapped) { - swapl(&rep.length, n); - swaps(&rep.sequenceNumber, n); - swapl(&rep.count, n); - } - - WriteToClient(client, sizeof(SELinuxListItemsReply), (char *)&rep); - WriteToClient(client, size * 4, (char *)buf); - - /* Free stuff and return */ - rc = client->noClientException; - xfree(buf); -out: - SELinuxFreeItems(items, count); - return rc; -} - -static int -ProcSELinuxListProperties(ClientPtr client) -{ - WindowPtr pWin; - PropertyPtr pProp; - SELinuxListItemRec *items; - int rc, count, size, i; - CARD32 id; - - REQUEST(SELinuxGetContextReq); - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - - rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess); - if (rc != Success) - return rc; - - /* Count the number of properties and allocate items */ - count = 0; - for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) - count++; - items = xcalloc(count, sizeof(SELinuxListItemRec)); - if (count && !items) - return BadAlloc; - - /* Fill in the items and calculate size */ - i = 0; - size = 0; - for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) { - id = pProp->propertyName; - rc = SELinuxPopulateItem(items + i, &pProp->devPrivates, id, &size); - if (rc != Success) { - SELinuxFreeItems(items, count); - return rc; - } - i++; - } - - return SELinuxSendItemsToClient(client, items, size, count); -} - -static int -ProcSELinuxListSelections(ClientPtr client) -{ - Selection *pSel; - SELinuxListItemRec *items; - int rc, count, size, i; - CARD32 id; - - REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq); - - /* Count the number of selections and allocate items */ - count = 0; - for (pSel = CurrentSelections; pSel; pSel = pSel->next) - count++; - items = xcalloc(count, sizeof(SELinuxListItemRec)); - if (count && !items) - return BadAlloc; - - /* Fill in the items and calculate size */ - i = 0; - size = 0; - for (pSel = CurrentSelections; pSel; pSel = pSel->next) { - id = pSel->selection; - rc = SELinuxPopulateItem(items + i, &pSel->devPrivates, id, &size); - if (rc != Success) { - SELinuxFreeItems(items, count); - return rc; - } - i++; - } - - return SELinuxSendItemsToClient(client, items, size, count); -} - -static int -ProcSELinuxDispatch(ClientPtr client) -{ - REQUEST(xReq); - switch (stuff->data) { - case X_SELinuxQueryVersion: - return ProcSELinuxQueryVersion(client); - case X_SELinuxSetDeviceCreateContext: - return ProcSELinuxSetCreateContext(client, CTX_DEV); - case X_SELinuxGetDeviceCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_DEV); - case X_SELinuxSetDeviceContext: - return ProcSELinuxSetDeviceContext(client); - case X_SELinuxGetDeviceContext: - return ProcSELinuxGetDeviceContext(client); - case X_SELinuxSetWindowCreateContext: - return ProcSELinuxSetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowContext: - return ProcSELinuxGetWindowContext(client); - case X_SELinuxSetPropertyCreateContext: - return ProcSELinuxSetCreateContext(client, CTX_PRP); - case X_SELinuxGetPropertyCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_PRP); - case X_SELinuxSetPropertyUseContext: - return ProcSELinuxSetCreateContext(client, USE_PRP); - case X_SELinuxGetPropertyUseContext: - return ProcSELinuxGetCreateContext(client, USE_PRP); - case X_SELinuxGetPropertyContext: - return ProcSELinuxGetPropertyContext(client, objectKey); - case X_SELinuxGetPropertyDataContext: - return ProcSELinuxGetPropertyContext(client, dataKey); - case X_SELinuxListProperties: - return ProcSELinuxListProperties(client); - case X_SELinuxSetSelectionCreateContext: - return ProcSELinuxSetCreateContext(client, CTX_SEL); - case X_SELinuxGetSelectionCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_SEL); - case X_SELinuxSetSelectionUseContext: - return ProcSELinuxSetCreateContext(client, USE_SEL); - case X_SELinuxGetSelectionUseContext: - return ProcSELinuxGetCreateContext(client, USE_SEL); - case X_SELinuxGetSelectionContext: - return ProcSELinuxGetSelectionContext(client, objectKey); - case X_SELinuxGetSelectionDataContext: - return ProcSELinuxGetSelectionContext(client, dataKey); - case X_SELinuxListSelections: - return ProcSELinuxListSelections(client); - case X_SELinuxGetClientContext: - return ProcSELinuxGetClientContext(client); - default: - return BadRequest; - } -} - -static int -SProcSELinuxQueryVersion(ClientPtr client) -{ - REQUEST(SELinuxQueryVersionReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxQueryVersionReq); - swaps(&stuff->client_major, n); - swaps(&stuff->client_minor, n); - return ProcSELinuxQueryVersion(client); -} - -static int -SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) -{ - REQUEST(SELinuxSetCreateContextReq); - int n; - - REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq); - swapl(&stuff->context_len, n); - return ProcSELinuxSetCreateContext(client, offset); -} - -static int -SProcSELinuxSetDeviceContext(ClientPtr client) -{ - REQUEST(SELinuxSetContextReq); - int n; - - REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq); - swapl(&stuff->id, n); - swapl(&stuff->context_len, n); - return ProcSELinuxSetDeviceContext(client); -} - -static int -SProcSELinuxGetDeviceContext(ClientPtr client) -{ - REQUEST(SELinuxGetContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - swapl(&stuff->id, n); - return ProcSELinuxGetDeviceContext(client); -} - -static int -SProcSELinuxGetWindowContext(ClientPtr client) -{ - REQUEST(SELinuxGetContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - swapl(&stuff->id, n); - return ProcSELinuxGetWindowContext(client); -} - -static int -SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) -{ - REQUEST(SELinuxGetPropertyContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq); - swapl(&stuff->window, n); - swapl(&stuff->property, n); - return ProcSELinuxGetPropertyContext(client, privKey); -} - -static int -SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) -{ - REQUEST(SELinuxGetContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - swapl(&stuff->id, n); - return ProcSELinuxGetSelectionContext(client, privKey); -} - -static int -SProcSELinuxListProperties(ClientPtr client) -{ - REQUEST(SELinuxGetContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - swapl(&stuff->id, n); - return ProcSELinuxListProperties(client); -} - -static int -SProcSELinuxGetClientContext(ClientPtr client) -{ - REQUEST(SELinuxGetContextReq); - int n; - - REQUEST_SIZE_MATCH(SELinuxGetContextReq); - swapl(&stuff->id, n); - return ProcSELinuxGetClientContext(client); -} - -static int -SProcSELinuxDispatch(ClientPtr client) -{ - REQUEST(xReq); - int n; - - swaps(&stuff->length, n); - - switch (stuff->data) { - case X_SELinuxQueryVersion: - return SProcSELinuxQueryVersion(client); - case X_SELinuxSetDeviceCreateContext: - return SProcSELinuxSetCreateContext(client, CTX_DEV); - case X_SELinuxGetDeviceCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_DEV); - case X_SELinuxSetDeviceContext: - return SProcSELinuxSetDeviceContext(client); - case X_SELinuxGetDeviceContext: - return SProcSELinuxGetDeviceContext(client); - case X_SELinuxSetWindowCreateContext: - return SProcSELinuxSetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowContext: - return SProcSELinuxGetWindowContext(client); - case X_SELinuxSetPropertyCreateContext: - return SProcSELinuxSetCreateContext(client, CTX_PRP); - case X_SELinuxGetPropertyCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_PRP); - case X_SELinuxSetPropertyUseContext: - return SProcSELinuxSetCreateContext(client, USE_PRP); - case X_SELinuxGetPropertyUseContext: - return ProcSELinuxGetCreateContext(client, USE_PRP); - case X_SELinuxGetPropertyContext: - return SProcSELinuxGetPropertyContext(client, objectKey); - case X_SELinuxGetPropertyDataContext: - return SProcSELinuxGetPropertyContext(client, dataKey); - case X_SELinuxListProperties: - return SProcSELinuxListProperties(client); - case X_SELinuxSetSelectionCreateContext: - return SProcSELinuxSetCreateContext(client, CTX_SEL); - case X_SELinuxGetSelectionCreateContext: - return ProcSELinuxGetCreateContext(client, CTX_SEL); - case X_SELinuxSetSelectionUseContext: - return SProcSELinuxSetCreateContext(client, USE_SEL); - case X_SELinuxGetSelectionUseContext: - return ProcSELinuxGetCreateContext(client, USE_SEL); - case X_SELinuxGetSelectionContext: - return SProcSELinuxGetSelectionContext(client, objectKey); - case X_SELinuxGetSelectionDataContext: - return SProcSELinuxGetSelectionContext(client, dataKey); - case X_SELinuxListSelections: - return ProcSELinuxListSelections(client); - case X_SELinuxGetClientContext: - return SProcSELinuxGetClientContext(client); - default: - return BadRequest; - } -} - -#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD -static int netlink_fd; - -static void -SELinuxBlockHandler(void *data, struct timeval **tv, void *read_mask) -{ -} - -static void -SELinuxWakeupHandler(void *data, int err, void *read_mask) -{ - if (FD_ISSET(netlink_fd, (fd_set *)read_mask)) - avc_netlink_check_nb(); -} -#endif - - -/* - * Extension Setup / Teardown - */ - -static void -SELinuxResetProc(ExtensionEntry *extEntry) -{ - /* Unregister callbacks */ - DeleteCallback(&ClientStateCallback, SELinuxClientState, NULL); - DeleteCallback(&ResourceStateCallback, SELinuxResourceState, NULL); - - XaceDeleteCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL); - XaceDeleteCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL); - XaceDeleteCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL); - XaceDeleteCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL); - XaceDeleteCallback(XACE_SEND_ACCESS, SELinuxSend, NULL); - XaceDeleteCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL); - XaceDeleteCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL); - XaceDeleteCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL); - XaceDeleteCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL); - XaceDeleteCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL); - XaceDeleteCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL); - XaceDeleteCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep); - - /* Tear down SELinux stuff */ - selabel_close(label_hnd); - label_hnd = NULL; - - audit_close(audit_fd); -#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD - avc_netlink_release_fd(); - RemoveBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler, - NULL); - RemoveGeneralSocket(netlink_fd); -#endif - - avc_destroy(); - avc_active = 0; - - /* Free local state */ - xfree(knownAtoms); - knownAtoms = NULL; - numKnownAtoms = 0; - - xfree(knownEvents); - knownEvents = NULL; - numKnownEvents = 0; - - xfree(knownTypes); - knownTypes = NULL; - numKnownTypes = 0; -} - -void -SELinuxExtensionInit(INITARGS) -{ - ExtensionEntry *extEntry; - struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 }; - struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 }; - security_context_t ctx; - int ret = TRUE; - - /* Check SELinux mode on system */ - if (!is_selinux_enabled()) { - ErrorF("SELinux: Disabled on system, not enabling in X server\n"); - return; - } - - /* Don't init unless there's something to do */ - if (!security_get_boolean_active("xserver_object_manager")) - return; - - /* Check SELinux mode in configuration file */ - switch(selinuxEnforcingState) { - case SELINUX_MODE_DISABLED: - LogMessage(X_INFO, "SELinux: Disabled in configuration file\n"); - return; - case SELINUX_MODE_ENFORCING: - LogMessage(X_INFO, "SELinux: Configured in enforcing mode\n"); - avc_option.value = (char *)1; - break; - case SELINUX_MODE_PERMISSIVE: - LogMessage(X_INFO, "SELinux: Configured in permissive mode\n"); - avc_option.value = (char *)0; - break; - default: - avc_option.type = AVC_OPT_UNUSED; - break; - } - - /* Set up SELinux stuff */ - selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog); - selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit); - - if (selinux_set_mapping(map) < 0) { - if (errno == EINVAL) { - ErrorF("SELinux: Invalid object class mapping, disabling SELinux support.\n"); - return; - } - FatalError("SELinux: Failed to set up security class mapping\n"); - } - - if (avc_open(&avc_option, 1) < 0) - FatalError("SELinux: Couldn't initialize SELinux userspace AVC\n"); - avc_active = 1; - - label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1); - if (!label_hnd) - FatalError("SELinux: Failed to open x_contexts mapping in policy\n"); - - if (security_get_initial_context_raw("unlabeled", &ctx) < 0) - FatalError("SELinux: Failed to look up unlabeled context\n"); - if (avc_context_to_sid_raw(ctx, &unlabeled_sid) < 0) - FatalError("SELinux: a context_to_SID call failed!\n"); - freecon(ctx); - - /* Prepare for auditing */ - audit_fd = audit_open(); - if (audit_fd < 0) - FatalError("SELinux: Failed to open the system audit log\n"); - - /* Allocate private storage */ - if (!dixRequestPrivate(subjectKey, sizeof(SELinuxSubjectRec)) || - !dixRequestPrivate(objectKey, sizeof(SELinuxObjectRec)) || - !dixRequestPrivate(dataKey, sizeof(SELinuxObjectRec))) - FatalError("SELinux: Failed to allocate private storage.\n"); - - /* Create atoms for doing window labeling */ - atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE); - if (atom_ctx == BAD_RESOURCE) - FatalError("SELinux: Failed to create atom\n"); - atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE); - if (atom_client_ctx == BAD_RESOURCE) - FatalError("SELinux: Failed to create atom\n"); - -#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD - netlink_fd = avc_netlink_acquire_fd(); - AddGeneralSocket(netlink_fd); - RegisterBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler, - NULL); -#endif - - /* Register callbacks */ - ret &= dixRegisterPrivateInitFunc(subjectKey, SELinuxSubjectInit, NULL); - ret &= dixRegisterPrivateDeleteFunc(subjectKey, SELinuxSubjectFree, NULL); - ret &= dixRegisterPrivateInitFunc(objectKey, SELinuxObjectInit, NULL); - ret &= dixRegisterPrivateDeleteFunc(objectKey, SELinuxObjectFree, NULL); - ret &= dixRegisterPrivateInitFunc(dataKey, SELinuxObjectInit, NULL); - ret &= dixRegisterPrivateDeleteFunc(dataKey, SELinuxObjectFree, NULL); - - ret &= AddCallback(&ClientStateCallback, SELinuxClientState, NULL); - ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, NULL); - - ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL); - ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL); - ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL); - ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL); - ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, NULL); - ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL); - ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL); - ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL); - ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL); - ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL); - ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL); - ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep); - if (!ret) - FatalError("SELinux: Failed to register one or more callbacks\n"); - - /* Add extension to server */ - extEntry = AddExtension(SELINUX_EXTENSION_NAME, - SELinuxNumberEvents, SELinuxNumberErrors, - ProcSELinuxDispatch, SProcSELinuxDispatch, - SELinuxResetProc, StandardMinorOpcode); - - AddExtensionAlias("Flask", extEntry); - - /* Label objects that were created before we could register ourself */ - SELinuxLabelInitial(); -} diff --git a/xorg-server/Xext/xselinux.h b/xorg-server/Xext/xselinux.h index e99f05b09..dcd250e76 100644 --- a/xorg-server/Xext/xselinux.h +++ b/xorg-server/Xext/xselinux.h @@ -20,8 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _XSELINUX_H #define _XSELINUX_H -#include "dixaccess.h" - /* Extension info */ #define SELINUX_EXTENSION_NAME "SELinux" #define SELINUX_MAJOR_VERSION 1 @@ -138,414 +136,4 @@ typedef struct { CARD32 pad6; } SELinuxListItemsReply; - -#ifdef _XSELINUX_NEED_FLASK -/* Private Flask definitions */ -#define SECCLASS_X_DRAWABLE 1 -#define SECCLASS_X_SCREEN 2 -#define SECCLASS_X_GC 3 -#define SECCLASS_X_FONT 4 -#define SECCLASS_X_COLORMAP 5 -#define SECCLASS_X_PROPERTY 6 -#define SECCLASS_X_SELECTION 7 -#define SECCLASS_X_CURSOR 8 -#define SECCLASS_X_CLIENT 9 -#define SECCLASS_X_DEVICE 10 -#define SECCLASS_X_SERVER 11 -#define SECCLASS_X_EXTENSION 12 -#define SECCLASS_X_EVENT 13 -#define SECCLASS_X_FAKEEVENT 14 -#define SECCLASS_X_RESOURCE 15 - -/* Mapping from DixAccess bits to Flask permissions */ -static struct security_class_mapping map[] = { - { "x_drawable", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "list_property", /* DixListPropAccess */ - "get_property", /* DixGetPropAccess */ - "set_property", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "list_child", /* DixListAccess */ - "add_child", /* DixAddAccess */ - "remove_child", /* DixRemoveAccess */ - "hide", /* DixHideAccess */ - "show", /* DixShowAccess */ - "blend", /* DixBlendAccess */ - "override", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "send", /* DixSendAccess */ - "receive", /* DixReceiveAccess */ - "", /* DixUseAccess */ - "manage", /* DixManageAccess */ - NULL }}, - { "x_screen", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "saver_getattr", /* DixListPropAccess */ - "saver_setattr", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "hide_cursor", /* DixHideAccess */ - "show_cursor", /* DixShowAccess */ - "saver_hide", /* DixBlendAccess */ - "saver_show", /* DixGrabAccess */ - NULL }}, - { "x_gc", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - NULL }}, - { "x_font", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "add_glyph", /* DixAddAccess */ - "remove_glyph", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - NULL }}, - { "x_colormap", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "add_color", /* DixAddAccess */ - "remove_color", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "install", /* DixInstallAccess */ - "uninstall", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - NULL }}, - { "x_property", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "write", /* DixBlendAccess */ - NULL }}, - { "x_selection", - { "read", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "setattr", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - NULL }}, - { "x_cursor", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - NULL }}, - { "x_client", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "", /* DixUseAccess */ - "manage", /* DixManageAccess */ - NULL }}, - { "x_device", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "destroy", /* DixDestroyAccess */ - "create", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "list_property", /* DixListPropAccess */ - "get_property", /* DixGetPropAccess */ - "set_property", /* DixSetPropAccess */ - "getfocus", /* DixGetFocusAccess */ - "setfocus", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "add", /* DixAddAccess */ - "remove", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "grab", /* DixGrabAccess */ - "freeze", /* DixFreezeAccess */ - "force_cursor", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - "manage", /* DixManageAccess */ - "", /* DixDebugAccess */ - "bell", /* DixBellAccess */ - NULL }}, - { "x_server", - { "record", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "getattr", /* DixGetAttrAccess */ - "setattr", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "grab", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "", /* DixUseAccess */ - "manage", /* DixManageAccess */ - "debug", /* DixDebugAccess */ - NULL }}, - { "x_extension", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "query", /* DixGetAttrAccess */ - "", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "", /* DixSendAccess */ - "", /* DixReceiveAccess */ - "use", /* DixUseAccess */ - NULL }}, - { "x_event", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "", /* DixGetAttrAccess */ - "", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "send", /* DixSendAccess */ - "receive", /* DixReceiveAccess */ - NULL }}, - { "x_synthetic_event", - { "", /* DixReadAccess */ - "", /* DixWriteAccess */ - "", /* DixDestroyAccess */ - "", /* DixCreateAccess */ - "", /* DixGetAttrAccess */ - "", /* DixSetAttrAccess */ - "", /* DixListPropAccess */ - "", /* DixGetPropAccess */ - "", /* DixSetPropAccess */ - "", /* DixGetFocusAccess */ - "", /* DixSetFocusAccess */ - "", /* DixListAccess */ - "", /* DixAddAccess */ - "", /* DixRemoveAccess */ - "", /* DixHideAccess */ - "", /* DixShowAccess */ - "", /* DixBlendAccess */ - "", /* DixGrabAccess */ - "", /* DixFreezeAccess */ - "", /* DixForceAccess */ - "", /* DixInstallAccess */ - "", /* DixUninstallAccess */ - "send", /* DixSendAccess */ - "receive", /* DixReceiveAccess */ - NULL }}, - { "x_resource", - { "read", /* DixReadAccess */ - "write", /* DixWriteAccess */ - "write", /* DixDestroyAccess */ - "write", /* DixCreateAccess */ - "read", /* DixGetAttrAccess */ - "write", /* DixSetAttrAccess */ - "read", /* DixListPropAccess */ - "read", /* DixGetPropAccess */ - "write", /* DixSetPropAccess */ - "read", /* DixGetFocusAccess */ - "write", /* DixSetFocusAccess */ - "read", /* DixListAccess */ - "write", /* DixAddAccess */ - "write", /* DixRemoveAccess */ - "write", /* DixHideAccess */ - "read", /* DixShowAccess */ - "read", /* DixBlendAccess */ - "write", /* DixGrabAccess */ - "write", /* DixFreezeAccess */ - "write", /* DixForceAccess */ - "write", /* DixInstallAccess */ - "write", /* DixUninstallAccess */ - "write", /* DixSendAccess */ - "read", /* DixReceiveAccess */ - "read", /* DixUseAccess */ - "write", /* DixManageAccess */ - "read", /* DixDebugAccess */ - "write", /* DixBellAccess */ - NULL }}, - { NULL } -}; - -/* x_resource "read" bits from the list above */ -#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \ - DixGetPropAccess|DixGetFocusAccess|DixListAccess| \ - DixShowAccess|DixBlendAccess|DixReceiveAccess| \ - DixUseAccess|DixDebugAccess) - -#endif /* _XSELINUX_NEED_FLASK */ #endif /* _XSELINUX_H */ diff --git a/xorg-server/Xext/xselinux_ext.c b/xorg-server/Xext/xselinux_ext.c new file mode 100644 index 000000000..b36fb13eb --- /dev/null +++ b/xorg-server/Xext/xselinux_ext.c @@ -0,0 +1,729 @@ +/************************************************************ + +Author: Eamon Walsh + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +********************************************************/ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#include "selection.h" +#include "inputstr.h" +#include "windowstr.h" +#include "propertyst.h" +#include "extnsionst.h" +#include "modinit.h" +#include "xselinuxint.h" + +#define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid) +#define CTX_WIN offsetof(SELinuxSubjectRec, win_create_sid) +#define CTX_PRP offsetof(SELinuxSubjectRec, prp_create_sid) +#define CTX_SEL offsetof(SELinuxSubjectRec, sel_create_sid) +#define USE_PRP offsetof(SELinuxSubjectRec, prp_use_sid) +#define USE_SEL offsetof(SELinuxSubjectRec, sel_use_sid) + +typedef struct { + security_context_t octx; + security_context_t dctx; + CARD32 octx_len; + CARD32 dctx_len; + CARD32 id; +} SELinuxListItemRec; + + +/* + * Extension Dispatch + */ + +static security_context_t +SELinuxCopyContext(char *ptr, unsigned len) +{ + security_context_t copy = xalloc(len + 1); + if (!copy) + return NULL; + strncpy(copy, ptr, len); + copy[len] = '\0'; + return copy; +} + +static int +ProcSELinuxQueryVersion(ClientPtr client) +{ + SELinuxQueryVersionReply rep; + + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; + rep.server_major = SELINUX_MAJOR_VERSION; + rep.server_minor = SELINUX_MINOR_VERSION; + if (client->swapped) { + int n; + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); + swaps(&rep.server_major, n); + swaps(&rep.server_minor, n); + } + WriteToClient(client, sizeof(rep), (char *)&rep); + return (client->noClientException); +} + +static int +SELinuxSendContextReply(ClientPtr client, security_id_t sid) +{ + SELinuxGetContextReply rep; + security_context_t ctx = NULL; + int len = 0; + + if (sid) { + if (avc_sid_to_context_raw(sid, &ctx) < 0) + return BadValue; + len = strlen(ctx) + 1; + } + + rep.type = X_Reply; + rep.length = bytes_to_int32(len); + rep.sequenceNumber = client->sequence; + rep.context_len = len; + + if (client->swapped) { + int n; + swapl(&rep.length, n); + swaps(&rep.sequenceNumber, n); + swapl(&rep.context_len, n); + } + + WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep); + WriteToClient(client, len, ctx); + freecon(ctx); + return client->noClientException; +} + +static int +ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) +{ + PrivateRec **privPtr = &client->devPrivates; + security_id_t *pSid; + security_context_t ctx = NULL; + char *ptr; + int rc; + + REQUEST(SELinuxSetCreateContextReq); + REQUEST_FIXED_SIZE(SELinuxSetCreateContextReq, stuff->context_len); + + if (stuff->context_len > 0) { + ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len); + if (!ctx) + return BadAlloc; + } + + ptr = dixLookupPrivate(privPtr, subjectKey); + pSid = (security_id_t *)(ptr + offset); + sidput(*pSid); + *pSid = NULL; + + rc = Success; + if (stuff->context_len > 0) { + if (security_check_context_raw(ctx) < 0 || + avc_context_to_sid_raw(ctx, pSid) < 0) + rc = BadValue; + } + + xfree(ctx); + return rc; +} + +static int +ProcSELinuxGetCreateContext(ClientPtr client, unsigned offset) +{ + security_id_t *pSid; + char *ptr; + + REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq); + + if (offset == CTX_DEV) + ptr = dixLookupPrivate(&serverClient->devPrivates, subjectKey); + else + ptr = dixLookupPrivate(&client->devPrivates, subjectKey); + + pSid = (security_id_t *)(ptr + offset); + return SELinuxSendContextReply(client, *pSid); +} + +static int +ProcSELinuxSetDeviceContext(ClientPtr client) +{ + security_context_t ctx; + security_id_t sid; + DeviceIntPtr dev; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + int rc; + + REQUEST(SELinuxSetContextReq); + REQUEST_FIXED_SIZE(SELinuxSetContextReq, stuff->context_len); + + if (stuff->context_len < 1) + return BadLength; + ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len); + if (!ctx) + return BadAlloc; + + rc = dixLookupDevice(&dev, stuff->id, client, DixManageAccess); + if (rc != Success) + goto out; + + if (security_check_context_raw(ctx) < 0 || + avc_context_to_sid_raw(ctx, &sid) < 0) { + rc = BadValue; + goto out; + } + + subj = dixLookupPrivate(&dev->devPrivates, subjectKey); + sidput(subj->sid); + subj->sid = sid; + obj = dixLookupPrivate(&dev->devPrivates, objectKey); + sidput(obj->sid); + sidget(obj->sid = sid); + + rc = Success; +out: + xfree(ctx); + return rc; +} + +static int +ProcSELinuxGetDeviceContext(ClientPtr client) +{ + DeviceIntPtr dev; + SELinuxSubjectRec *subj; + int rc; + + REQUEST(SELinuxGetContextReq); + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + + rc = dixLookupDevice(&dev, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + subj = dixLookupPrivate(&dev->devPrivates, subjectKey); + return SELinuxSendContextReply(client, subj->sid); +} + +static int +ProcSELinuxGetWindowContext(ClientPtr client) +{ + WindowPtr pWin; + SELinuxObjectRec *obj; + int rc; + + REQUEST(SELinuxGetContextReq); + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + + rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + obj = dixLookupPrivate(&pWin->devPrivates, objectKey); + return SELinuxSendContextReply(client, obj->sid); +} + +static int +ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) +{ + WindowPtr pWin; + PropertyPtr pProp; + SELinuxObjectRec *obj; + int rc; + + REQUEST(SELinuxGetPropertyContextReq); + REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq); + + rc = dixLookupWindow(&pWin, stuff->window, client, DixGetPropAccess); + if (rc != Success) + return rc; + + rc = dixLookupProperty(&pProp, pWin, stuff->property, client, + DixGetAttrAccess); + if (rc != Success) + return rc; + + obj = dixLookupPrivate(&pProp->devPrivates, privKey); + return SELinuxSendContextReply(client, obj->sid); +} + +static int +ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) +{ + Selection *pSel; + SELinuxObjectRec *obj; + int rc; + + REQUEST(SELinuxGetContextReq); + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + + rc = dixLookupSelection(&pSel, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + obj = dixLookupPrivate(&pSel->devPrivates, privKey); + return SELinuxSendContextReply(client, obj->sid); +} + +static int +ProcSELinuxGetClientContext(ClientPtr client) +{ + ClientPtr target; + SELinuxSubjectRec *subj; + int rc; + + REQUEST(SELinuxGetContextReq); + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + + rc = dixLookupClient(&target, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + subj = dixLookupPrivate(&target->devPrivates, subjectKey); + return SELinuxSendContextReply(client, subj->sid); +} + +static int +SELinuxPopulateItem(SELinuxListItemRec *i, PrivateRec **privPtr, CARD32 id, + int *size) +{ + SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey); + SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey); + + if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0) + return BadValue; + if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0) + return BadValue; + + i->id = id; + i->octx_len = bytes_to_int32(strlen(i->octx) + 1); + i->dctx_len = bytes_to_int32(strlen(i->dctx) + 1); + + *size += i->octx_len + i->dctx_len + 3; + return Success; +} + +static void +SELinuxFreeItems(SELinuxListItemRec *items, int count) +{ + int k; + for (k = 0; k < count; k++) { + freecon(items[k].octx); + freecon(items[k].dctx); + } + xfree(items); +} + +static int +SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items, + int size, int count) +{ + int rc, k, n, pos = 0; + SELinuxListItemsReply rep; + CARD32 *buf; + + buf = xcalloc(size, sizeof(CARD32)); + if (size && !buf) { + rc = BadAlloc; + goto out; + } + + /* Fill in the buffer */ + for (k = 0; k < count; k++) { + buf[pos] = items[k].id; + if (client->swapped) + swapl(buf + pos, n); + pos++; + + buf[pos] = items[k].octx_len * 4; + if (client->swapped) + swapl(buf + pos, n); + pos++; + + buf[pos] = items[k].dctx_len * 4; + if (client->swapped) + swapl(buf + pos, n); + pos++; + + memcpy((char *)(buf + pos), items[k].octx, strlen(items[k].octx) + 1); + pos += items[k].octx_len; + memcpy((char *)(buf + pos), items[k].dctx, strlen(items[k].dctx) + 1); + pos += items[k].dctx_len; + } + + /* Send reply to client */ + rep.type = X_Reply; + rep.length = size; + rep.sequenceNumber = client->sequence; + rep.count = count; + + if (client->swapped) { + swapl(&rep.length, n); + swaps(&rep.sequenceNumber, n); + swapl(&rep.count, n); + } + + WriteToClient(client, sizeof(SELinuxListItemsReply), (char *)&rep); + WriteToClient(client, size * 4, (char *)buf); + + /* Free stuff and return */ + rc = client->noClientException; + xfree(buf); +out: + SELinuxFreeItems(items, count); + return rc; +} + +static int +ProcSELinuxListProperties(ClientPtr client) +{ + WindowPtr pWin; + PropertyPtr pProp; + SELinuxListItemRec *items; + int rc, count, size, i; + CARD32 id; + + REQUEST(SELinuxGetContextReq); + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + + rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess); + if (rc != Success) + return rc; + + /* Count the number of properties and allocate items */ + count = 0; + for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) + count++; + items = xcalloc(count, sizeof(SELinuxListItemRec)); + if (count && !items) + return BadAlloc; + + /* Fill in the items and calculate size */ + i = 0; + size = 0; + for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) { + id = pProp->propertyName; + rc = SELinuxPopulateItem(items + i, &pProp->devPrivates, id, &size); + if (rc != Success) { + SELinuxFreeItems(items, count); + return rc; + } + i++; + } + + return SELinuxSendItemsToClient(client, items, size, count); +} + +static int +ProcSELinuxListSelections(ClientPtr client) +{ + Selection *pSel; + SELinuxListItemRec *items; + int rc, count, size, i; + CARD32 id; + + REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq); + + /* Count the number of selections and allocate items */ + count = 0; + for (pSel = CurrentSelections; pSel; pSel = pSel->next) + count++; + items = xcalloc(count, sizeof(SELinuxListItemRec)); + if (count && !items) + return BadAlloc; + + /* Fill in the items and calculate size */ + i = 0; + size = 0; + for (pSel = CurrentSelections; pSel; pSel = pSel->next) { + id = pSel->selection; + rc = SELinuxPopulateItem(items + i, &pSel->devPrivates, id, &size); + if (rc != Success) { + SELinuxFreeItems(items, count); + return rc; + } + i++; + } + + return SELinuxSendItemsToClient(client, items, size, count); +} + +static int +ProcSELinuxDispatch(ClientPtr client) +{ + REQUEST(xReq); + switch (stuff->data) { + case X_SELinuxQueryVersion: + return ProcSELinuxQueryVersion(client); + case X_SELinuxSetDeviceCreateContext: + return ProcSELinuxSetCreateContext(client, CTX_DEV); + case X_SELinuxGetDeviceCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_DEV); + case X_SELinuxSetDeviceContext: + return ProcSELinuxSetDeviceContext(client); + case X_SELinuxGetDeviceContext: + return ProcSELinuxGetDeviceContext(client); + case X_SELinuxSetWindowCreateContext: + return ProcSELinuxSetCreateContext(client, CTX_WIN); + case X_SELinuxGetWindowCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_WIN); + case X_SELinuxGetWindowContext: + return ProcSELinuxGetWindowContext(client); + case X_SELinuxSetPropertyCreateContext: + return ProcSELinuxSetCreateContext(client, CTX_PRP); + case X_SELinuxGetPropertyCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_PRP); + case X_SELinuxSetPropertyUseContext: + return ProcSELinuxSetCreateContext(client, USE_PRP); + case X_SELinuxGetPropertyUseContext: + return ProcSELinuxGetCreateContext(client, USE_PRP); + case X_SELinuxGetPropertyContext: + return ProcSELinuxGetPropertyContext(client, objectKey); + case X_SELinuxGetPropertyDataContext: + return ProcSELinuxGetPropertyContext(client, dataKey); + case X_SELinuxListProperties: + return ProcSELinuxListProperties(client); + case X_SELinuxSetSelectionCreateContext: + return ProcSELinuxSetCreateContext(client, CTX_SEL); + case X_SELinuxGetSelectionCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_SEL); + case X_SELinuxSetSelectionUseContext: + return ProcSELinuxSetCreateContext(client, USE_SEL); + case X_SELinuxGetSelectionUseContext: + return ProcSELinuxGetCreateContext(client, USE_SEL); + case X_SELinuxGetSelectionContext: + return ProcSELinuxGetSelectionContext(client, objectKey); + case X_SELinuxGetSelectionDataContext: + return ProcSELinuxGetSelectionContext(client, dataKey); + case X_SELinuxListSelections: + return ProcSELinuxListSelections(client); + case X_SELinuxGetClientContext: + return ProcSELinuxGetClientContext(client); + default: + return BadRequest; + } +} + +static int +SProcSELinuxQueryVersion(ClientPtr client) +{ + REQUEST(SELinuxQueryVersionReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxQueryVersionReq); + swaps(&stuff->client_major, n); + swaps(&stuff->client_minor, n); + return ProcSELinuxQueryVersion(client); +} + +static int +SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) +{ + REQUEST(SELinuxSetCreateContextReq); + int n; + + REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq); + swapl(&stuff->context_len, n); + return ProcSELinuxSetCreateContext(client, offset); +} + +static int +SProcSELinuxSetDeviceContext(ClientPtr client) +{ + REQUEST(SELinuxSetContextReq); + int n; + + REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq); + swapl(&stuff->id, n); + swapl(&stuff->context_len, n); + return ProcSELinuxSetDeviceContext(client); +} + +static int +SProcSELinuxGetDeviceContext(ClientPtr client) +{ + REQUEST(SELinuxGetContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + swapl(&stuff->id, n); + return ProcSELinuxGetDeviceContext(client); +} + +static int +SProcSELinuxGetWindowContext(ClientPtr client) +{ + REQUEST(SELinuxGetContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + swapl(&stuff->id, n); + return ProcSELinuxGetWindowContext(client); +} + +static int +SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey) +{ + REQUEST(SELinuxGetPropertyContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq); + swapl(&stuff->window, n); + swapl(&stuff->property, n); + return ProcSELinuxGetPropertyContext(client, privKey); +} + +static int +SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey) +{ + REQUEST(SELinuxGetContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + swapl(&stuff->id, n); + return ProcSELinuxGetSelectionContext(client, privKey); +} + +static int +SProcSELinuxListProperties(ClientPtr client) +{ + REQUEST(SELinuxGetContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + swapl(&stuff->id, n); + return ProcSELinuxListProperties(client); +} + +static int +SProcSELinuxGetClientContext(ClientPtr client) +{ + REQUEST(SELinuxGetContextReq); + int n; + + REQUEST_SIZE_MATCH(SELinuxGetContextReq); + swapl(&stuff->id, n); + return ProcSELinuxGetClientContext(client); +} + +static int +SProcSELinuxDispatch(ClientPtr client) +{ + REQUEST(xReq); + int n; + + swaps(&stuff->length, n); + + switch (stuff->data) { + case X_SELinuxQueryVersion: + return SProcSELinuxQueryVersion(client); + case X_SELinuxSetDeviceCreateContext: + return SProcSELinuxSetCreateContext(client, CTX_DEV); + case X_SELinuxGetDeviceCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_DEV); + case X_SELinuxSetDeviceContext: + return SProcSELinuxSetDeviceContext(client); + case X_SELinuxGetDeviceContext: + return SProcSELinuxGetDeviceContext(client); + case X_SELinuxSetWindowCreateContext: + return SProcSELinuxSetCreateContext(client, CTX_WIN); + case X_SELinuxGetWindowCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_WIN); + case X_SELinuxGetWindowContext: + return SProcSELinuxGetWindowContext(client); + case X_SELinuxSetPropertyCreateContext: + return SProcSELinuxSetCreateContext(client, CTX_PRP); + case X_SELinuxGetPropertyCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_PRP); + case X_SELinuxSetPropertyUseContext: + return SProcSELinuxSetCreateContext(client, USE_PRP); + case X_SELinuxGetPropertyUseContext: + return ProcSELinuxGetCreateContext(client, USE_PRP); + case X_SELinuxGetPropertyContext: + return SProcSELinuxGetPropertyContext(client, objectKey); + case X_SELinuxGetPropertyDataContext: + return SProcSELinuxGetPropertyContext(client, dataKey); + case X_SELinuxListProperties: + return SProcSELinuxListProperties(client); + case X_SELinuxSetSelectionCreateContext: + return SProcSELinuxSetCreateContext(client, CTX_SEL); + case X_SELinuxGetSelectionCreateContext: + return ProcSELinuxGetCreateContext(client, CTX_SEL); + case X_SELinuxSetSelectionUseContext: + return SProcSELinuxSetCreateContext(client, USE_SEL); + case X_SELinuxGetSelectionUseContext: + return ProcSELinuxGetCreateContext(client, USE_SEL); + case X_SELinuxGetSelectionContext: + return SProcSELinuxGetSelectionContext(client, objectKey); + case X_SELinuxGetSelectionDataContext: + return SProcSELinuxGetSelectionContext(client, dataKey); + case X_SELinuxListSelections: + return ProcSELinuxListSelections(client); + case X_SELinuxGetClientContext: + return SProcSELinuxGetClientContext(client); + default: + return BadRequest; + } +} + + +/* + * Extension Setup / Teardown + */ + +static void +SELinuxResetProc(ExtensionEntry *extEntry) +{ + SELinuxFlaskReset(); + SELinuxLabelReset(); +} + +void +SELinuxExtensionInit(INITARGS) +{ + ExtensionEntry *extEntry; + + /* Check SELinux mode on system, configuration file, and boolean */ + if (!is_selinux_enabled()) { + LogMessage(X_INFO, "SELinux: Disabled on system\n"); + return; + } + if (selinuxEnforcingState == SELINUX_MODE_DISABLED) { + LogMessage(X_INFO, "SELinux: Disabled in configuration file\n"); + return; + } + if (!security_get_boolean_active("xserver_object_manager")) { + LogMessage(X_INFO, "SELinux: Disabled by boolean\n"); + return; + } + + /* Set up XACE hooks */ + SELinuxLabelInit(); + SELinuxFlaskInit(); + + /* Add extension to server */ + extEntry = AddExtension(SELINUX_EXTENSION_NAME, + SELinuxNumberEvents, SELinuxNumberErrors, + ProcSELinuxDispatch, SProcSELinuxDispatch, + SELinuxResetProc, StandardMinorOpcode); + + AddExtensionAlias("Flask", extEntry); +} diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c new file mode 100644 index 000000000..43683ff24 --- /dev/null +++ b/xorg-server/Xext/xselinux_hooks.c @@ -0,0 +1,1030 @@ +/************************************************************ + +Author: Eamon Walsh + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +********************************************************/ + +/* + * Portions of this code copyright (c) 2005 by Trusted Computer Solutions, Inc. + * All rights reserved. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#include +#include +#include + +#include + +#include +#include "selection.h" +#include "inputstr.h" +#include "scrnintstr.h" +#include "windowstr.h" +#include "propertyst.h" +#include "extnsionst.h" +#include "xacestr.h" +#include "../os/osdep.h" +#define _XSELINUX_NEED_FLASK_MAP +#include "xselinuxint.h" + + +/* structure passed to auditing callback */ +typedef struct { + ClientPtr client; /* client */ + DeviceIntPtr dev; /* device */ + char *command; /* client's executable path */ + unsigned id; /* resource id, if any */ + int restype; /* resource type, if any */ + int event; /* event type, if any */ + Atom property; /* property name, if any */ + Atom selection; /* selection name, if any */ + char *extension; /* extension name, if any */ +} SELinuxAuditRec; + +/* private state keys */ +static int subjectKeyIndex; +DevPrivateKey subjectKey = &subjectKeyIndex; +static int objectKeyIndex; +DevPrivateKey objectKey = &objectKeyIndex; +static int dataKeyIndex; +DevPrivateKey dataKey = &dataKeyIndex; + +/* audit file descriptor */ +static int audit_fd; + +/* whether AVC is active */ +static int avc_active; + +/* atoms for window label properties */ +static Atom atom_ctx; +static Atom atom_client_ctx; + +/* The unlabeled SID */ +static security_id_t unlabeled_sid; + +/* forward declarations */ +static void SELinuxScreen(CallbackListPtr *, pointer, pointer); + +/* "true" pointer value for use as callback data */ +static pointer truep = (pointer)1; + + +/* + * Performs an SELinux permission check. + */ +static int +SELinuxDoCheck(SELinuxSubjectRec *subj, SELinuxObjectRec *obj, + security_class_t class, Mask mode, SELinuxAuditRec *auditdata) +{ + /* serverClient requests OK */ + if (subj->privileged) + return Success; + + auditdata->command = subj->command; + errno = 0; + + if (avc_has_perm(subj->sid, obj->sid, class, mode, &subj->aeref, + auditdata) < 0) { + if (mode == DixUnknownAccess) + return Success; /* DixUnknownAccess requests OK ... for now */ + if (errno == EACCES) + return BadAccess; + ErrorF("SELinux: avc_has_perm: unexpected error %d\n", errno); + return BadValue; + } + + return Success; +} + +/* + * Labels a newly connected client. + */ +static void +SELinuxLabelClient(ClientPtr client) +{ + int fd = XaceGetConnectionNumber(client); + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + security_context_t ctx; + + subj = dixLookupPrivate(&client->devPrivates, subjectKey); + sidput(subj->sid); + obj = dixLookupPrivate(&client->devPrivates, objectKey); + sidput(obj->sid); + + /* Try to get a context from the socket */ + if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) { + /* Otherwise, fall back to a default context */ + ctx = SELinuxDefaultClientLabel(); + } + + /* For local clients, try and determine the executable name */ + if (XaceIsLocal(client)) { + struct ucred creds; + socklen_t len = sizeof(creds); + char path[PATH_MAX + 1]; + size_t bytes; + + memset(&creds, 0, sizeof(creds)); + if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0) + goto finish; + + snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid); + fd = open(path, O_RDONLY); + if (fd < 0) + goto finish; + + bytes = read(fd, path, PATH_MAX + 1); + close(fd); + if (bytes <= 0) + goto finish; + + subj->command = xalloc(bytes); + if (!subj->command) + goto finish; + + memcpy(subj->command, path, bytes); + subj->command[bytes - 1] = 0; + } + +finish: + /* Get a SID from the context */ + if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) + FatalError("SELinux: client %d: context_to_sid_raw(%s) failed\n", + client->index, ctx); + + sidget(obj->sid = subj->sid); + freecon(ctx); +} + +/* + * Labels initial server objects. + */ +static void +SELinuxLabelInitial(void) +{ + int i; + XaceScreenAccessRec srec; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + security_context_t ctx; + pointer unused; + + /* Do the serverClient */ + subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey); + obj = dixLookupPrivate(&serverClient->devPrivates, objectKey); + subj->privileged = 1; + sidput(subj->sid); + + /* Use the context of the X server process for the serverClient */ + if (getcon_raw(&ctx) < 0) + FatalError("SELinux: couldn't get context of X server process\n"); + + /* Get a SID from the context */ + if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) + FatalError("SELinux: serverClient: context_to_sid(%s) failed\n", ctx); + + sidget(obj->sid = subj->sid); + freecon(ctx); + + srec.client = serverClient; + srec.access_mode = DixCreateAccess; + srec.status = Success; + + for (i = 0; i < screenInfo.numScreens; i++) { + /* Do the screen object */ + srec.screen = screenInfo.screens[i]; + SELinuxScreen(NULL, NULL, &srec); + + /* Do the default colormap */ + dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap, + RT_COLORMAP, serverClient, DixCreateAccess); + } +} + +/* + * Labels new resource objects. + */ +static int +SELinuxLabelResource(XaceResourceAccessRec *rec, SELinuxSubjectRec *subj, + SELinuxObjectRec *obj, security_class_t class) +{ + int offset; + security_id_t tsid; + + /* Check for a create context */ + if (rec->rtype == RT_WINDOW && subj->win_create_sid) { + sidget(obj->sid = subj->win_create_sid); + return Success; + } + + if (rec->parent) + offset = dixLookupPrivateOffset(rec->ptype); + + if (rec->parent && offset >= 0) { + /* Use the SID of the parent object in the labeling operation */ + PrivateRec **privatePtr = DEVPRIV_AT(rec->parent, offset); + SELinuxObjectRec *pobj = dixLookupPrivate(privatePtr, objectKey); + tsid = pobj->sid; + } else { + /* Use the SID of the subject */ + tsid = subj->sid; + } + + /* Perform a transition to obtain the final SID */ + if (avc_compute_create(subj->sid, tsid, class, &obj->sid) < 0) { + ErrorF("SELinux: a compute_create call failed!\n"); + return BadValue; + } + + return Success; +} + + +/* + * Libselinux Callbacks + */ + +static int +SELinuxAudit(void *auditdata, + security_class_t class, + char *msgbuf, + size_t msgbufsize) +{ + SELinuxAuditRec *audit = auditdata; + ClientPtr client = audit->client; + char idNum[16]; + const char *propertyName, *selectionName; + int major = -1, minor = -1; + + if (client) { + REQUEST(xReq); + if (stuff) { + major = stuff->reqType; + minor = MinorOpcodeOfRequest(client); + } + } + if (audit->id) + snprintf(idNum, 16, "%x", audit->id); + + propertyName = audit->property ? NameForAtom(audit->property) : NULL; + selectionName = audit->selection ? NameForAtom(audit->selection) : NULL; + + return snprintf(msgbuf, msgbufsize, + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + (major >= 0) ? "request=" : "", + (major >= 0) ? LookupRequestName(major, minor) : "", + audit->command ? " comm=" : "", + audit->command ? audit->command : "", + audit->dev ? " xdevice=\"" : "", + audit->dev ? audit->dev->name : "", + audit->dev ? "\"" : "", + audit->id ? " resid=" : "", + audit->id ? idNum : "", + audit->restype ? " restype=" : "", + audit->restype ? LookupResourceName(audit->restype) : "", + audit->event ? " event=" : "", + audit->event ? LookupEventName(audit->event & 127) : "", + audit->property ? " property=" : "", + audit->property ? propertyName : "", + audit->selection ? " selection=" : "", + audit->selection ? selectionName : "", + audit->extension ? " extension=" : "", + audit->extension ? audit->extension : ""); +} + +static int +SELinuxLog(int type, const char *fmt, ...) +{ + va_list ap; + char buf[MAX_AUDIT_MESSAGE_LENGTH]; + int rc, aut; + + switch (type) { + case SELINUX_INFO: + aut = AUDIT_USER_MAC_POLICY_LOAD; + break; + case SELINUX_AVC: + aut = AUDIT_USER_AVC; + break; + default: + aut = AUDIT_USER_SELINUX_ERR; + break; + } + + va_start(ap, fmt); + vsnprintf(buf, MAX_AUDIT_MESSAGE_LENGTH, fmt, ap); + rc = audit_log_user_avc_message(audit_fd, aut, buf, NULL, NULL, NULL, 0); + va_end(ap); + LogMessageVerb(X_WARNING, 0, "%s", buf); + return 0; +} + +/* + * XACE Callbacks + */ + +static void +SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceDeviceAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev }; + security_class_t cls; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&rec->dev->devPrivates, objectKey); + + /* If this is a new object that needs labeling, do it now */ + if (rec->access_mode & DixCreateAccess) { + SELinuxSubjectRec *dsubj; + dsubj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey); + + sidput(dsubj->sid); + sidput(obj->sid); + + if (subj->dev_create_sid) { + /* Label the device with the create context */ + sidget(obj->sid = subj->dev_create_sid); + sidget(dsubj->sid = subj->dev_create_sid); + } else { + /* Label the device directly with the process SID */ + sidget(obj->sid = subj->sid); + sidget(dsubj->sid = subj->sid); + } + } + + cls = IsPointerDevice(rec->dev) ? SECCLASS_X_POINTER : SECCLASS_X_KEYBOARD; + rc = SELinuxDoCheck(subj, obj, cls, rec->access_mode, &auditdata); + if (rc != Success) + rec->status = rc; +} + +static void +SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceSendAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj, ev_sid; + SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev }; + security_class_t class; + int rc, i, type; + + if (rec->dev) + subj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey); + else + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + + obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey); + + /* Check send permission on window */ + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixSendAccess, + &auditdata); + if (rc != Success) + goto err; + + /* Check send permission on specific event types */ + for (i = 0; i < rec->count; i++) { + type = rec->events[i].u.u.type; + class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT; + + rc = SELinuxEventToSID(type, obj->sid, &ev_sid); + if (rc != Success) + goto err; + + auditdata.event = type; + rc = SELinuxDoCheck(subj, &ev_sid, class, DixSendAccess, &auditdata); + if (rc != Success) + goto err; + } + return; +err: + rec->status = rc; +} + +static void +SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceReceiveAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj, ev_sid; + SELinuxAuditRec auditdata = { .client = NULL }; + security_class_t class; + int rc, i, type; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey); + + /* Check receive permission on window */ + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixReceiveAccess, + &auditdata); + if (rc != Success) + goto err; + + /* Check receive permission on specific event types */ + for (i = 0; i < rec->count; i++) { + type = rec->events[i].u.u.type; + class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT; + + rc = SELinuxEventToSID(type, obj->sid, &ev_sid); + if (rc != Success) + goto err; + + auditdata.event = type; + rc = SELinuxDoCheck(subj, &ev_sid, class, DixReceiveAccess, &auditdata); + if (rc != Success) + goto err; + } + return; +err: + rec->status = rc; +} + +static void +SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceExtAccessRec *rec = calldata; + SELinuxSubjectRec *subj, *serv; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client }; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&rec->ext->devPrivates, objectKey); + + /* If this is a new object that needs labeling, do it now */ + /* XXX there should be a separate callback for this */ + if (obj->sid == unlabeled_sid) { + security_id_t sid; + + serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey); + rc = SELinuxExtensionToSID(rec->ext->name, &sid); + if (rc != Success) { + rec->status = rc; + return; + } + + sidput(obj->sid); + + /* Perform a transition to obtain the final SID */ + if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION, + &obj->sid) < 0) { + ErrorF("SELinux: a SID transition call failed!\n"); + rec->status = BadValue; + return; + } + } + + /* Perform the security check */ + auditdata.extension = rec->ext->name; + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_EXTENSION, rec->access_mode, + &auditdata); + if (rc != Success) + rec->status = rc; +} + +static void +SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceSelectionAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj, *data; + Selection *pSel = *rec->ppSel; + Atom name = pSel->selection; + Mask access_mode = rec->access_mode; + SELinuxAuditRec auditdata = { .client = rec->client, .selection = name }; + security_id_t tsid; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&pSel->devPrivates, objectKey); + + /* If this is a new object that needs labeling, do it now */ + if (access_mode & DixCreateAccess) { + sidput(obj->sid); + rc = SELinuxSelectionToSID(name, subj, &obj->sid, &obj->poly); + if (rc != Success) + obj->sid = unlabeled_sid; + access_mode = DixSetAttrAccess; + } + /* If this is a polyinstantiated object, find the right instance */ + else if (obj->poly) { + rc = SELinuxSelectionToSID(name, subj, &tsid, NULL); + if (rc != Success) { + rec->status = rc; + return; + } + while (pSel->selection != name || obj->sid != tsid) { + if ((pSel = pSel->next) == NULL) + break; + obj = dixLookupPrivate(&pSel->devPrivates, objectKey); + } + sidput(tsid); + + if (pSel) + *rec->ppSel = pSel; + else { + rec->status = BadMatch; + return; + } + } + + /* Perform the security check */ + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, access_mode, + &auditdata); + if (rc != Success) + rec->status = rc; + + /* Label the content (advisory only) */ + if (access_mode & DixSetAttrAccess) { + data = dixLookupPrivate(&pSel->devPrivates, dataKey); + sidput(data->sid); + if (subj->sel_create_sid) + sidget(data->sid = subj->sel_create_sid); + else + sidget(data->sid = obj->sid); + } +} + +static void +SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XacePropertyAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj, *data; + PropertyPtr pProp = *rec->ppProp; + Atom name = pProp->propertyName; + SELinuxAuditRec auditdata = { .client = rec->client, .property = name }; + security_id_t tsid; + int rc; + + /* Don't care about the new content check */ + if (rec->access_mode & DixPostAccess) + return; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&pProp->devPrivates, objectKey); + + /* If this is a new object that needs labeling, do it now */ + if (rec->access_mode & DixCreateAccess) { + sidput(obj->sid); + rc = SELinuxPropertyToSID(name, subj, &obj->sid, &obj->poly); + if (rc != Success) { + rec->status = rc; + return; + } + } + /* If this is a polyinstantiated object, find the right instance */ + else if (obj->poly) { + rc = SELinuxPropertyToSID(name, subj, &tsid, NULL); + if (rc != Success) { + rec->status = rc; + return; + } + while (pProp->propertyName != name || obj->sid != tsid) { + if ((pProp = pProp->next) == NULL) + break; + obj = dixLookupPrivate(&pProp->devPrivates, objectKey); + } + sidput(tsid); + + if (pProp) + *rec->ppProp = pProp; + else { + rec->status = BadMatch; + return; + } + } + + /* Perform the security check */ + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_PROPERTY, rec->access_mode, + &auditdata); + if (rc != Success) + rec->status = rc; + + /* Label the content (advisory only) */ + if (rec->access_mode & DixWriteAccess) { + data = dixLookupPrivate(&pProp->devPrivates, dataKey); + sidput(data->sid); + if (subj->prp_create_sid) + sidget(data->sid = subj->prp_create_sid); + else + sidget(data->sid = obj->sid); + } +} + +static void +SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceResourceAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client }; + Mask access_mode = rec->access_mode; + PrivateRec **privatePtr; + security_class_t class; + int rc, offset; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + + /* Determine if the resource object has a devPrivates field */ + offset = dixLookupPrivateOffset(rec->rtype); + if (offset < 0) { + /* No: use the SID of the owning client */ + class = SECCLASS_X_RESOURCE; + privatePtr = &clients[CLIENT_ID(rec->id)]->devPrivates; + obj = dixLookupPrivate(privatePtr, objectKey); + } else { + /* Yes: use the SID from the resource object itself */ + class = SELinuxTypeToClass(rec->rtype); + privatePtr = DEVPRIV_AT(rec->res, offset); + obj = dixLookupPrivate(privatePtr, objectKey); + } + + /* If this is a new object that needs labeling, do it now */ + if (access_mode & DixCreateAccess && offset >= 0) { + rc = SELinuxLabelResource(rec, subj, obj, class); + if (rc != Success) { + rec->status = rc; + return; + } + } + + /* Collapse generic resource permissions down to read/write */ + if (class == SECCLASS_X_RESOURCE) { + access_mode = !!(rec->access_mode & SELinuxReadMask); /* rd */ + access_mode |= !!(rec->access_mode & ~SELinuxReadMask) << 1; /* wr */ + } + + /* Perform the security check */ + auditdata.restype = rec->rtype; + auditdata.id = rec->id; + rc = SELinuxDoCheck(subj, obj, class, access_mode, &auditdata); + if (rc != Success) + rec->status = rc; + + /* Perform the background none check on windows */ + if (access_mode & DixCreateAccess && rec->rtype == RT_WINDOW) { + rc = SELinuxDoCheck(subj, obj, class, DixBlendAccess, &auditdata); + if (rc != Success) + ((WindowPtr)rec->res)->forcedBG = TRUE; + } +} + +static void +SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata) +{ + XaceScreenAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client }; + Mask access_mode = rec->access_mode; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&rec->screen->devPrivates, objectKey); + + /* If this is a new object that needs labeling, do it now */ + if (access_mode & DixCreateAccess) { + sidput(obj->sid); + + /* Perform a transition to obtain the final SID */ + if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN, + &obj->sid) < 0) { + ErrorF("SELinux: a compute_create call failed!\n"); + rec->status = BadValue; + return; + } + } + + if (is_saver) + access_mode <<= 2; + + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SCREEN, access_mode, &auditdata); + if (rc != Success) + rec->status = rc; +} + +static void +SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceClientAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client }; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&rec->target->devPrivates, objectKey); + + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_CLIENT, rec->access_mode, + &auditdata); + if (rc != Success) + rec->status = rc; +} + +static void +SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + XaceServerAccessRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + SELinuxAuditRec auditdata = { .client = rec->client }; + int rc; + + subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey); + obj = dixLookupPrivate(&serverClient->devPrivates, objectKey); + + rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SERVER, rec->access_mode, + &auditdata); + if (rc != Success) + rec->status = rc; +} + + +/* + * DIX Callbacks + */ + +static void +SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + NewClientInfoRec *pci = calldata; + + switch (pci->client->clientState) { + case ClientStateInitial: + SELinuxLabelClient(pci->client); + break; + + default: + break; + } +} + +static void +SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + ResourceStateInfoRec *rec = calldata; + SELinuxSubjectRec *subj; + SELinuxObjectRec *obj; + WindowPtr pWin; + + if (rec->type != RT_WINDOW) + return; + if (rec->state != ResourceStateAdding) + return; + + pWin = (WindowPtr)rec->value; + subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey); + + if (subj->sid) { + security_context_t ctx; + int rc = avc_sid_to_context_raw(subj->sid, &ctx); + if (rc < 0) + FatalError("SELinux: Failed to get security context!\n"); + rc = dixChangeWindowProperty(serverClient, + pWin, atom_client_ctx, XA_STRING, 8, + PropModeReplace, strlen(ctx), ctx, FALSE); + if (rc != Success) + FatalError("SELinux: Failed to set label property on window!\n"); + freecon(ctx); + } else + FatalError("SELinux: Unexpected unlabeled client found\n"); + + obj = dixLookupPrivate(&pWin->devPrivates, objectKey); + + if (obj->sid) { + security_context_t ctx; + int rc = avc_sid_to_context_raw(obj->sid, &ctx); + if (rc < 0) + FatalError("SELinux: Failed to get security context!\n"); + rc = dixChangeWindowProperty(serverClient, + pWin, atom_ctx, XA_STRING, 8, + PropModeReplace, strlen(ctx), ctx, FALSE); + if (rc != Success) + FatalError("SELinux: Failed to set label property on window!\n"); + freecon(ctx); + } else + FatalError("SELinux: Unexpected unlabeled window found\n"); +} + + +/* + * DevPrivates Callbacks + */ + +static void +SELinuxSubjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + PrivateCallbackRec *rec = calldata; + SELinuxSubjectRec *subj = *rec->value; + + sidget(unlabeled_sid); + subj->sid = unlabeled_sid; + + avc_entry_ref_init(&subj->aeref); +} + +static void +SELinuxSubjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + PrivateCallbackRec *rec = calldata; + SELinuxSubjectRec *subj = *rec->value; + + xfree(subj->command); + + if (avc_active) { + sidput(subj->sid); + sidput(subj->dev_create_sid); + sidput(subj->win_create_sid); + sidput(subj->sel_create_sid); + sidput(subj->prp_create_sid); + } +} + +static void +SELinuxObjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + PrivateCallbackRec *rec = calldata; + SELinuxObjectRec *obj = *rec->value; + + sidget(unlabeled_sid); + obj->sid = unlabeled_sid; +} + +static void +SELinuxObjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata) +{ + PrivateCallbackRec *rec = calldata; + SELinuxObjectRec *obj = *rec->value; + + if (avc_active) + sidput(obj->sid); +} + +#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD +static int netlink_fd; + +static void +SELinuxBlockHandler(void *data, struct timeval **tv, void *read_mask) +{ +} + +static void +SELinuxWakeupHandler(void *data, int err, void *read_mask) +{ + if (FD_ISSET(netlink_fd, (fd_set *)read_mask)) + avc_netlink_check_nb(); +} +#endif + +void +SELinuxFlaskReset(void) +{ + /* Unregister callbacks */ + DeleteCallback(&ClientStateCallback, SELinuxClientState, NULL); + DeleteCallback(&ResourceStateCallback, SELinuxResourceState, NULL); + + XaceDeleteCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL); + XaceDeleteCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL); + XaceDeleteCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL); + XaceDeleteCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL); + XaceDeleteCallback(XACE_SEND_ACCESS, SELinuxSend, NULL); + XaceDeleteCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL); + XaceDeleteCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL); + XaceDeleteCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL); + XaceDeleteCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL); + XaceDeleteCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL); + XaceDeleteCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL); + XaceDeleteCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep); + + /* Tear down SELinux stuff */ + audit_close(audit_fd); +#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD + avc_netlink_release_fd(); + RemoveBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler, + NULL); + RemoveGeneralSocket(netlink_fd); +#endif + + avc_destroy(); + avc_active = 0; +} + +void +SELinuxFlaskInit(void) +{ + struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 }; + security_context_t ctx; + int ret = TRUE; + + switch(selinuxEnforcingState) { + case SELINUX_MODE_ENFORCING: + LogMessage(X_INFO, "SELinux: Configured in enforcing mode\n"); + avc_option.value = (char *)1; + break; + case SELINUX_MODE_PERMISSIVE: + LogMessage(X_INFO, "SELinux: Configured in permissive mode\n"); + avc_option.value = (char *)0; + break; + default: + avc_option.type = AVC_OPT_UNUSED; + break; + } + + /* Set up SELinux stuff */ + selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog); + selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit); + + if (selinux_set_mapping(map) < 0) { + if (errno == EINVAL) { + ErrorF("SELinux: Invalid object class mapping, disabling SELinux support.\n"); + return; + } + FatalError("SELinux: Failed to set up security class mapping\n"); + } + + if (avc_open(&avc_option, 1) < 0) + FatalError("SELinux: Couldn't initialize SELinux userspace AVC\n"); + avc_active = 1; + + if (security_get_initial_context_raw("unlabeled", &ctx) < 0) + FatalError("SELinux: Failed to look up unlabeled context\n"); + if (avc_context_to_sid_raw(ctx, &unlabeled_sid) < 0) + FatalError("SELinux: a context_to_SID call failed!\n"); + freecon(ctx); + + /* Prepare for auditing */ + audit_fd = audit_open(); + if (audit_fd < 0) + FatalError("SELinux: Failed to open the system audit log\n"); + + /* Allocate private storage */ + if (!dixRequestPrivate(subjectKey, sizeof(SELinuxSubjectRec)) || + !dixRequestPrivate(objectKey, sizeof(SELinuxObjectRec)) || + !dixRequestPrivate(dataKey, sizeof(SELinuxObjectRec))) + FatalError("SELinux: Failed to allocate private storage.\n"); + + /* Create atoms for doing window labeling */ + atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE); + if (atom_ctx == BAD_RESOURCE) + FatalError("SELinux: Failed to create atom\n"); + atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE); + if (atom_client_ctx == BAD_RESOURCE) + FatalError("SELinux: Failed to create atom\n"); + +#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD + netlink_fd = avc_netlink_acquire_fd(); + AddGeneralSocket(netlink_fd); + RegisterBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler, + NULL); +#endif + + /* Register callbacks */ + ret &= dixRegisterPrivateInitFunc(subjectKey, SELinuxSubjectInit, NULL); + ret &= dixRegisterPrivateDeleteFunc(subjectKey, SELinuxSubjectFree, NULL); + ret &= dixRegisterPrivateInitFunc(objectKey, SELinuxObjectInit, NULL); + ret &= dixRegisterPrivateDeleteFunc(objectKey, SELinuxObjectFree, NULL); + ret &= dixRegisterPrivateInitFunc(dataKey, SELinuxObjectInit, NULL); + ret &= dixRegisterPrivateDeleteFunc(dataKey, SELinuxObjectFree, NULL); + + ret &= AddCallback(&ClientStateCallback, SELinuxClientState, NULL); + ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, NULL); + + ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL); + ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL); + ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL); + ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL); + ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, NULL); + ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL); + ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL); + ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL); + ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL); + ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL); + ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL); + ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep); + if (!ret) + FatalError("SELinux: Failed to register one or more callbacks\n"); + + /* Label objects that were created before we could register ourself */ + SELinuxLabelInitial(); +} diff --git a/xorg-server/Xext/xselinux_label.c b/xorg-server/Xext/xselinux_label.c new file mode 100644 index 000000000..239536cf3 --- /dev/null +++ b/xorg-server/Xext/xselinux_label.c @@ -0,0 +1,381 @@ +/************************************************************ + +Author: Eamon Walsh + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +********************************************************/ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#include + +#include "registry.h" +#include "xselinuxint.h" + +/* selection and property atom cache */ +typedef struct { + SELinuxObjectRec prp; + SELinuxObjectRec sel; +} SELinuxAtomRec; + +/* dynamic array */ +typedef struct { + unsigned size; + void **array; +} SELinuxArrayRec; + +/* labeling handle */ +static struct selabel_handle *label_hnd; + +/* Array of object classes indexed by resource type */ +SELinuxArrayRec arr_types; +/* Array of event SIDs indexed by event type */ +SELinuxArrayRec arr_events; +/* Array of property and selection SID structures */ +SELinuxArrayRec arr_atoms; + +/* + * Dynamic array helpers + */ +static void * +SELinuxArrayGet(SELinuxArrayRec *rec, unsigned key) +{ + return (rec->size > key) ? rec->array[key] : 0; +} + +static int +SELinuxArraySet(SELinuxArrayRec *rec, unsigned key, void *val) +{ + if (key >= rec->size) { + /* Need to increase size of array */ + rec->array = xrealloc(rec->array, (key + 1) * sizeof(val)); + if (!rec->array) + return FALSE; + memset(rec->array + rec->size, 0, (key - rec->size + 1) * sizeof(val)); + rec->size = key + 1; + } + + rec->array[key] = val; + return TRUE; +} + +static void +SELinuxArrayFree(SELinuxArrayRec *rec, int free_elements) +{ + if (free_elements) { + unsigned i = rec->size; + while (i) + xfree(rec->array[--i]); + } + + xfree(rec->array); + rec->size = 0; + rec->array = NULL; +} + +/* + * Looks up a name in the selection or property mappings + */ +static int +SELinuxAtomToSIDLookup(Atom atom, SELinuxObjectRec *obj, int map, int polymap) +{ + const char *name = NameForAtom(atom); + security_context_t ctx; + int rc = Success; + + obj->poly = 1; + + /* Look in the mappings of names to contexts */ + if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) { + obj->poly = 0; + } else if (errno != ENOENT) { + ErrorF("SELinux: a property label lookup failed!\n"); + return BadValue; + } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) { + ErrorF("SELinux: a property label lookup failed!\n"); + return BadValue; + } + + /* Get a SID for context */ + if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); + rc = BadAlloc; + } + + freecon(ctx); + return rc; +} + +/* + * Looks up the SID corresponding to the given property or selection atom + */ +int +SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn) +{ + SELinuxAtomRec *rec; + SELinuxObjectRec *obj; + int rc, map, polymap; + + rec = SELinuxArrayGet(&arr_atoms, atom); + if (!rec) { + rec = xcalloc(1, sizeof(SELinuxAtomRec)); + if (!rec || !SELinuxArraySet(&arr_atoms, atom, rec)) + return BadAlloc; + } + + if (prop) { + obj = &rec->prp; + map = SELABEL_X_PROP; + polymap = SELABEL_X_POLYPROP; + } else { + obj = &rec->sel; + map = SELABEL_X_SELN; + polymap = SELABEL_X_POLYSELN; + } + + if (!obj->sid) { + rc = SELinuxAtomToSIDLookup(atom, obj, map, polymap); + if (rc != Success) + goto out; + } + + *obj_rtn = obj; + rc = Success; +out: + return rc; +} + +/* + * Looks up a SID for a selection/subject pair + */ +int +SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj, + security_id_t *sid_rtn, int *poly_rtn) +{ + int rc; + SELinuxObjectRec *obj; + security_id_t tsid; + + /* Get the default context and polyinstantiation bit */ + rc = SELinuxAtomToSID(selection, 0, &obj); + if (rc != Success) + return rc; + + /* Check for an override context next */ + if (subj->sel_use_sid) { + sidget(tsid = subj->sel_use_sid); + goto out; + } + + sidget(tsid = obj->sid); + + /* Polyinstantiate if necessary to obtain the final SID */ + if (obj->poly) { + sidput(tsid); + if (avc_compute_member(subj->sid, obj->sid, + SECCLASS_X_SELECTION, &tsid) < 0) { + ErrorF("SELinux: a compute_member call failed!\n"); + return BadValue; + } + } +out: + *sid_rtn = tsid; + if (poly_rtn) + *poly_rtn = obj->poly; + return Success; +} + +/* + * Looks up a SID for a property/subject pair + */ +int +SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj, + security_id_t *sid_rtn, int *poly_rtn) +{ + int rc; + SELinuxObjectRec *obj; + security_id_t tsid, tsid2; + + /* Get the default context and polyinstantiation bit */ + rc = SELinuxAtomToSID(property, 1, &obj); + if (rc != Success) + return rc; + + /* Check for an override context next */ + if (subj->prp_use_sid) { + sidget(tsid = subj->prp_use_sid); + goto out; + } + + /* Perform a transition */ + if (avc_compute_create(subj->sid, obj->sid, + SECCLASS_X_PROPERTY, &tsid) < 0) { + ErrorF("SELinux: a compute_create call failed!\n"); + return BadValue; + } + + /* Polyinstantiate if necessary to obtain the final SID */ + if (obj->poly) { + tsid2 = tsid; + if (avc_compute_member(subj->sid, tsid2, + SECCLASS_X_PROPERTY, &tsid) < 0) { + ErrorF("SELinux: a compute_member call failed!\n"); + sidput(tsid2); + return BadValue; + } + sidput(tsid2); + } +out: + *sid_rtn = tsid; + if (poly_rtn) + *poly_rtn = obj->poly; + return Success; +} + +/* + * Looks up the SID corresponding to the given event type + */ +int +SELinuxEventToSID(unsigned type, security_id_t sid_of_window, + SELinuxObjectRec *sid_return) +{ + const char *name = LookupEventName(type); + security_id_t sid; + security_context_t ctx; + type &= 127; + + sid = SELinuxArrayGet(&arr_events, type); + if (!sid) { + /* Look in the mappings of event names to contexts */ + if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) { + ErrorF("SELinux: an event label lookup failed!\n"); + return BadValue; + } + /* Get a SID for context */ + if (avc_context_to_sid_raw(ctx, &sid) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); + freecon(ctx); + return BadAlloc; + } + freecon(ctx); + /* Cache the SID value */ + if (!SELinuxArraySet(&arr_events, type, sid)) { + sidput(sid); + return BadAlloc; + } + } + + /* Perform a transition to obtain the final SID */ + if (avc_compute_create(sid_of_window, sid, SECCLASS_X_EVENT, + &sid_return->sid) < 0) { + ErrorF("SELinux: a compute_create call failed!\n"); + return BadValue; + } + + return Success; +} + +int +SELinuxExtensionToSID(const char *name, security_id_t *sid_rtn) +{ + security_context_t ctx; + + /* Look in the mappings of extension names to contexts */ + if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) { + ErrorF("SELinux: a property label lookup failed!\n"); + return BadValue; + } + /* Get a SID for context */ + if (avc_context_to_sid_raw(ctx, sid_rtn) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); + freecon(ctx); + return BadAlloc; + } + freecon(ctx); + return Success; +} + +/* + * Returns the object class corresponding to the given resource type. + */ +security_class_t +SELinuxTypeToClass(RESTYPE type) +{ + void *tmp; + + tmp = SELinuxArrayGet(&arr_types, type & TypeMask); + if (!tmp) { + unsigned long class = SECCLASS_X_RESOURCE; + + if (type & RC_DRAWABLE) + class = SECCLASS_X_DRAWABLE; + else if (type == RT_GC) + class = SECCLASS_X_GC; + else if (type == RT_FONT) + class = SECCLASS_X_FONT; + else if (type == RT_CURSOR) + class = SECCLASS_X_CURSOR; + else if (type == RT_COLORMAP) + class = SECCLASS_X_COLORMAP; + else { + /* Need to do a string lookup */ + const char *str = LookupResourceName(type); + if (!strcmp(str, "PICTURE")) + class = SECCLASS_X_DRAWABLE; + else if (!strcmp(str, "GLYPHSET")) + class = SECCLASS_X_FONT; + } + + tmp = (void *)class; + SELinuxArraySet(&arr_types, type & TypeMask, tmp); + } + + return (security_class_t)(unsigned long)tmp; +} + +security_context_t +SELinuxDefaultClientLabel(void) +{ + security_context_t ctx; + + if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0) + FatalError("SELinux: failed to look up remote-client context\n"); + + return ctx; +} + +void +SELinuxLabelInit(void) +{ + struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 }; + + label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1); + if (!label_hnd) + FatalError("SELinux: Failed to open x_contexts mapping in policy\n"); +} + +void +SELinuxLabelReset(void) +{ + selabel_close(label_hnd); + label_hnd = NULL; + + /* Free local state */ + SELinuxArrayFree(&arr_types, 0); + SELinuxArrayFree(&arr_events, 0); + SELinuxArrayFree(&arr_atoms, 1); +} diff --git a/xorg-server/Xext/xselinuxint.h b/xorg-server/Xext/xselinuxint.h new file mode 100644 index 000000000..854a57dd7 --- /dev/null +++ b/xorg-server/Xext/xselinuxint.h @@ -0,0 +1,556 @@ +/************************************************************ + +Author: Eamon Walsh + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +********************************************************/ + +#ifndef _XSELINUXINT_H +#define _XSELINUXINT_H + +#include +#include + +#include "globals.h" +#include "dixaccess.h" +#include "dixstruct.h" +#include "privates.h" +#include "resource.h" +#include "registry.h" +#include "inputstr.h" +#include "xselinux.h" + +/* + * Types + */ + +/* subject state (clients and devices only) */ +typedef struct { + security_id_t sid; + security_id_t dev_create_sid; + security_id_t win_create_sid; + security_id_t sel_create_sid; + security_id_t prp_create_sid; + security_id_t sel_use_sid; + security_id_t prp_use_sid; + struct avc_entry_ref aeref; + char *command; + int privileged; +} SELinuxSubjectRec; + +/* object state */ +typedef struct { + security_id_t sid; + int poly; +} SELinuxObjectRec; + +/* + * Globals + */ + +extern DevPrivateKey subjectKey; +extern DevPrivateKey objectKey; +extern DevPrivateKey dataKey; + +/* + * Label functions + */ + +int +SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn); + +int +SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj, + security_id_t *sid_rtn, int *poly_rtn); + +int +SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj, + security_id_t *sid_rtn, int *poly_rtn); + +int +SELinuxEventToSID(unsigned type, security_id_t sid_of_window, + SELinuxObjectRec *sid_return); + +int +SELinuxExtensionToSID(const char *name, security_id_t *sid_rtn); + +security_class_t +SELinuxTypeToClass(RESTYPE type); + +security_context_t +SELinuxDefaultClientLabel(void); + +void +SELinuxLabelInit(void); + +void +SELinuxLabelReset(void); + +/* + * Security module functions + */ + +void +SELinuxFlaskInit(void); + +void +SELinuxFlaskReset(void); + + +/* + * Private Flask definitions + */ + +/* Security class constants */ +#define SECCLASS_X_DRAWABLE 1 +#define SECCLASS_X_SCREEN 2 +#define SECCLASS_X_GC 3 +#define SECCLASS_X_FONT 4 +#define SECCLASS_X_COLORMAP 5 +#define SECCLASS_X_PROPERTY 6 +#define SECCLASS_X_SELECTION 7 +#define SECCLASS_X_CURSOR 8 +#define SECCLASS_X_CLIENT 9 +#define SECCLASS_X_POINTER 10 +#define SECCLASS_X_KEYBOARD 11 +#define SECCLASS_X_SERVER 12 +#define SECCLASS_X_EXTENSION 13 +#define SECCLASS_X_EVENT 14 +#define SECCLASS_X_FAKEEVENT 15 +#define SECCLASS_X_RESOURCE 16 + +#ifdef _XSELINUX_NEED_FLASK_MAP +/* Mapping from DixAccess bits to Flask permissions */ +static struct security_class_mapping map[] = { + { "x_drawable", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "list_property", /* DixListPropAccess */ + "get_property", /* DixGetPropAccess */ + "set_property", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "list_child", /* DixListAccess */ + "add_child", /* DixAddAccess */ + "remove_child", /* DixRemoveAccess */ + "hide", /* DixHideAccess */ + "show", /* DixShowAccess */ + "blend", /* DixBlendAccess */ + "override", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "send", /* DixSendAccess */ + "receive", /* DixReceiveAccess */ + "", /* DixUseAccess */ + "manage", /* DixManageAccess */ + NULL }}, + { "x_screen", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "saver_getattr", /* DixListPropAccess */ + "saver_setattr", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "hide_cursor", /* DixHideAccess */ + "show_cursor", /* DixShowAccess */ + "saver_hide", /* DixBlendAccess */ + "saver_show", /* DixGrabAccess */ + NULL }}, + { "x_gc", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + NULL }}, + { "x_font", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "add_glyph", /* DixAddAccess */ + "remove_glyph", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + NULL }}, + { "x_colormap", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "add_color", /* DixAddAccess */ + "remove_color", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "install", /* DixInstallAccess */ + "uninstall", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + NULL }}, + { "x_property", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "write", /* DixBlendAccess */ + NULL }}, + { "x_selection", + { "read", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "setattr", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + NULL }}, + { "x_cursor", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + NULL }}, + { "x_client", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "", /* DixUseAccess */ + "manage", /* DixManageAccess */ + NULL }}, + { "x_pointer", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "list_property", /* DixListPropAccess */ + "get_property", /* DixGetPropAccess */ + "set_property", /* DixSetPropAccess */ + "getfocus", /* DixGetFocusAccess */ + "setfocus", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "add", /* DixAddAccess */ + "remove", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "grab", /* DixGrabAccess */ + "freeze", /* DixFreezeAccess */ + "force_cursor", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + "manage", /* DixManageAccess */ + "", /* DixDebugAccess */ + "bell", /* DixBellAccess */ + NULL }}, + { "x_keyboard", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "destroy", /* DixDestroyAccess */ + "create", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "list_property", /* DixListPropAccess */ + "get_property", /* DixGetPropAccess */ + "set_property", /* DixSetPropAccess */ + "getfocus", /* DixGetFocusAccess */ + "setfocus", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "add", /* DixAddAccess */ + "remove", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "grab", /* DixGrabAccess */ + "freeze", /* DixFreezeAccess */ + "force_cursor", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + "manage", /* DixManageAccess */ + "", /* DixDebugAccess */ + "bell", /* DixBellAccess */ + NULL }}, + { "x_server", + { "record", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "getattr", /* DixGetAttrAccess */ + "setattr", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "grab", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "", /* DixUseAccess */ + "manage", /* DixManageAccess */ + "debug", /* DixDebugAccess */ + NULL }}, + { "x_extension", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "query", /* DixGetAttrAccess */ + "", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "", /* DixSendAccess */ + "", /* DixReceiveAccess */ + "use", /* DixUseAccess */ + NULL }}, + { "x_event", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "", /* DixGetAttrAccess */ + "", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "send", /* DixSendAccess */ + "receive", /* DixReceiveAccess */ + NULL }}, + { "x_synthetic_event", + { "", /* DixReadAccess */ + "", /* DixWriteAccess */ + "", /* DixDestroyAccess */ + "", /* DixCreateAccess */ + "", /* DixGetAttrAccess */ + "", /* DixSetAttrAccess */ + "", /* DixListPropAccess */ + "", /* DixGetPropAccess */ + "", /* DixSetPropAccess */ + "", /* DixGetFocusAccess */ + "", /* DixSetFocusAccess */ + "", /* DixListAccess */ + "", /* DixAddAccess */ + "", /* DixRemoveAccess */ + "", /* DixHideAccess */ + "", /* DixShowAccess */ + "", /* DixBlendAccess */ + "", /* DixGrabAccess */ + "", /* DixFreezeAccess */ + "", /* DixForceAccess */ + "", /* DixInstallAccess */ + "", /* DixUninstallAccess */ + "send", /* DixSendAccess */ + "receive", /* DixReceiveAccess */ + NULL }}, + { "x_resource", + { "read", /* DixReadAccess */ + "write", /* DixWriteAccess */ + "write", /* DixDestroyAccess */ + "write", /* DixCreateAccess */ + "read", /* DixGetAttrAccess */ + "write", /* DixSetAttrAccess */ + "read", /* DixListPropAccess */ + "read", /* DixGetPropAccess */ + "write", /* DixSetPropAccess */ + "read", /* DixGetFocusAccess */ + "write", /* DixSetFocusAccess */ + "read", /* DixListAccess */ + "write", /* DixAddAccess */ + "write", /* DixRemoveAccess */ + "write", /* DixHideAccess */ + "read", /* DixShowAccess */ + "read", /* DixBlendAccess */ + "write", /* DixGrabAccess */ + "write", /* DixFreezeAccess */ + "write", /* DixForceAccess */ + "write", /* DixInstallAccess */ + "write", /* DixUninstallAccess */ + "write", /* DixSendAccess */ + "read", /* DixReceiveAccess */ + "read", /* DixUseAccess */ + "write", /* DixManageAccess */ + "read", /* DixDebugAccess */ + "write", /* DixBellAccess */ + NULL }}, + { NULL } +}; + +/* x_resource "read" bits from the list above */ +#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \ + DixGetPropAccess|DixGetFocusAccess|DixListAccess| \ + DixShowAccess|DixBlendAccess|DixReceiveAccess| \ + DixUseAccess|DixDebugAccess) + +#endif /* _XSELINUX_NEED_FLASK_MAP */ +#endif /* _XSELINUXINT_H */ diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c index 6b0e9fd14..5af2b5c83 100644 --- a/xorg-server/Xext/xtest.c +++ b/xorg-server/Xext/xtest.c @@ -640,8 +640,8 @@ int AllocXTestDevice (ClientPtr client, char* name, retval = AllocDevicePair( client, xtestname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE); if ( retval == Success ){ - dixSetPrivate(&((*ptr)->devPrivates), XTestDevicePrivateKey, (void *)master_ptr->id); - dixSetPrivate(&((*keybd)->devPrivates), XTestDevicePrivateKey, (void *)master_keybd->id); + dixSetPrivate(&((*ptr)->devPrivates), XTestDevicePrivateKey, (void *)(intptr_t)master_ptr->id); + dixSetPrivate(&((*keybd)->devPrivates), XTestDevicePrivateKey, (void *)(intptr_t)master_keybd->id); XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), XA_INTEGER, 8, PropModeReplace, 1, &dummy, @@ -677,7 +677,7 @@ IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master) return is_XTest; tmp = dixLookupPrivate(&dev->devPrivates, XTestDevicePrivateKey); - mid = (int)tmp; + mid = (intptr_t)tmp; /* deviceid 0 is reserved for XIAllDevices, non-zero mid means XTest * device */ diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c index 04cd11a3f..5229916a9 100644 --- a/xorg-server/Xext/xvdisp.c +++ b/xorg-server/Xext/xvdisp.c @@ -1912,7 +1912,7 @@ void XineramifyXv(void) if((pAdapt->type & XvImageMask) && (pAdapt->nImages > 0)) { hasOverlay = FALSE; for(l = 0; l < pAdapt->nAttributes; l++) { - if(!strcmp(pAdapt->name, "XV_COLORKEY")) { + if(!strcmp(pAdapt->pAttributes[l].name, "XV_COLORKEY")) { hasOverlay = TRUE; break; } diff --git a/xorg-server/Xi/Makefile.in b/xorg-server/Xi/Makefile.in index c4c483c81..dab5eeddd 100644 --- a/xorg-server/Xi/Makefile.in +++ b/xorg-server/Xi/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -254,7 +251,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -268,7 +264,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -354,6 +347,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -385,7 +379,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/Xi/queryst.c b/xorg-server/Xi/queryst.c index 2ba1edb63..78b97a769 100644 --- a/xorg-server/Xi/queryst.c +++ b/xorg-server/Xi/queryst.c @@ -96,7 +96,7 @@ ProcXQueryDeviceState(ClientPtr client) rep.sequenceNumber = client->sequence; rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess); - if (rc != Success) + if (rc != Success && rc != BadAccess) return rc; v = dev->valuator; @@ -130,8 +130,9 @@ ProcXQueryDeviceState(ClientPtr client) tk->length = sizeof(xKeyState); tk->num_keys = k->xkbInfo->desc->max_key_code - k->xkbInfo->desc->min_key_code + 1; - for (i = 0; i < 32; i++) - tk->keys[i] = k->down[i]; + if (rc != BadAccess) + for (i = 0; i < 32; i++) + tk->keys[i] = k->down[i]; buf += sizeof(xKeyState); } @@ -140,7 +141,8 @@ ProcXQueryDeviceState(ClientPtr client) tb->class = ButtonClass; tb->length = sizeof(xButtonState); tb->num_buttons = b->numButtons; - memcpy(tb->buttons, b->down, sizeof(b->down)); + if (rc != BadAccess) + memcpy(tb->buttons, b->down, sizeof(b->down)); buf += sizeof(xButtonState); } @@ -152,7 +154,9 @@ ProcXQueryDeviceState(ClientPtr client) tv->mode = v->mode; buf += sizeof(xValuatorState); for (i = 0, values = v->axisVal; i < v->numAxes; i++) { - *((int *)buf) = *values++; + if (rc != BadAccess) + *((int *)buf) = *values; + values++; if (client->swapped) { swapl((int *)buf, n); /* macro - braces needed */ } diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c index 68d91fa87..435868de2 100644 --- a/xorg-server/Xi/xiquerydevice.c +++ b/xorg-server/Xi/xiquerydevice.c @@ -45,7 +45,8 @@ #include "xiquerydevice.h" static Bool ShouldSkipDevice(ClientPtr client, int deviceid, DeviceIntPtr d); -static int ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info); +static int +ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo* info); static int SizeDeviceInfo(DeviceIntPtr dev); static void SwapDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info); int @@ -119,7 +120,7 @@ ProcXIQueryDevice(ClientPtr client) ptr = info; if (dev) { - len = ListDeviceInfo(dev, (xXIDeviceInfo*)info); + len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info); if (client->swapped) SwapDeviceInfo(dev, (xXIDeviceInfo*)info); info += len; @@ -131,7 +132,7 @@ ProcXIQueryDevice(ClientPtr client) { if (!skip[i]) { - len = ListDeviceInfo(dev, (xXIDeviceInfo*)info); + len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info); if (client->swapped) SwapDeviceInfo(dev, (xXIDeviceInfo*)info); info += len; @@ -143,7 +144,7 @@ ProcXIQueryDevice(ClientPtr client) { if (!skip[i]) { - len = ListDeviceInfo(dev, (xXIDeviceInfo*)info); + len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info); if (client->swapped) SwapDeviceInfo(dev, (xXIDeviceInfo*)info); info += len; @@ -240,7 +241,7 @@ SizeDeviceClasses(DeviceIntPtr dev) * @return Number of bytes written into info. */ int -ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info) +ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info, Bool reportState) { unsigned char *bits; int mask_len; @@ -257,9 +258,11 @@ ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info) bits = (unsigned char*)&info[1]; memset(bits, 0, mask_len * 4); - for (i = 0; dev && dev->button && i < dev->button->numButtons; i++) - if (BitIsOn(dev->button->down, i)) - SetBit(bits, i); + if (reportState) + for (i = 0; dev && dev->button && i < dev->button->numButtons; i++) + if (BitIsOn(dev->button->down, i)) + SetBit(bits, i); + bits += mask_len * 4; memcpy(bits, dev->button->labels, dev->button->numButtons * sizeof(Atom)); @@ -327,7 +330,8 @@ SwapKeyInfo(DeviceIntPtr dev, xXIKeyInfo* info) * @return The number of bytes written into info. */ int -ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber) +ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber, + Bool reportState) { ValuatorClassPtr v = dev->valuator; @@ -345,6 +349,9 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber) info->mode = v->mode; /* Server doesn't have per-axis mode yet */ info->sourceid = v->sourceid; + if (!reportState) + info->value = info->min; + return info->length * 4; } @@ -389,7 +396,7 @@ int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment) * @return The number of bytes used. */ static int -ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info) +ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo* info) { char *any = (char*)&info[1]; int len = 0, total_len = 0; @@ -407,7 +414,8 @@ ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info) any += len; total_len += len; - return total_len + ListDeviceClasses(dev, any, &info->num_classes); + total_len += ListDeviceClasses(client, dev, any, &info->num_classes); + return total_len; } /** @@ -416,16 +424,21 @@ ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info) * written. */ int -ListDeviceClasses(DeviceIntPtr dev, char *any, uint16_t *nclasses) +ListDeviceClasses(ClientPtr client, DeviceIntPtr dev, + char *any, uint16_t *nclasses) { int total_len = 0; int len; int i; + int rc; + + /* Check if the current device state should be suppressed */ + rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess); if (dev->button) { (*nclasses)++; - len = ListButtonInfo(dev, (xXIButtonInfo*)any); + len = ListButtonInfo(dev, (xXIButtonInfo*)any, rc == Success); any += len; total_len += len; } @@ -441,7 +454,7 @@ ListDeviceClasses(DeviceIntPtr dev, char *any, uint16_t *nclasses) for (i = 0; dev->valuator && i < dev->valuator->numAxes; i++) { (*nclasses)++; - len = ListValuatorInfo(dev, (xXIValuatorInfo*)any, i); + len = ListValuatorInfo(dev, (xXIValuatorInfo*)any, i, rc == Success); any += len; total_len += len; } diff --git a/xorg-server/Xi/xiquerydevice.h b/xorg-server/Xi/xiquerydevice.h index 34e87bdde..02f06591e 100644 --- a/xorg-server/Xi/xiquerydevice.h +++ b/xorg-server/Xi/xiquerydevice.h @@ -37,9 +37,11 @@ int SProcXIQueryDevice(ClientPtr client); int ProcXIQueryDevice(ClientPtr client); void SRepXIQueryDevice(ClientPtr client, int size, xXIQueryDeviceReply *rep); int SizeDeviceClasses(DeviceIntPtr dev); -int ListDeviceClasses(DeviceIntPtr dev, char* any, uint16_t* nclasses); +int ListDeviceClasses(ClientPtr client, DeviceIntPtr dev, + char* any, uint16_t* nclasses); int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment); -int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info); +int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info, Bool reportState); int ListKeyInfo(DeviceIntPtr dev, xXIKeyInfo* info); -int ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber); +int ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, + int axisnumber, Bool reportState); #endif /* QUERYDEV_H */ diff --git a/xorg-server/aclocal.m4 b/xorg-server/aclocal.m4 index 2dffe3170..ab6c1e847 100644 --- a/xorg-server/aclocal.m4 +++ b/xorg-server/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -87,14 +87,16 @@ fi]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -138,9 +140,9 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -1201,7 +1203,6 @@ m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) -m4_include([m4/shave.m4]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. @@ -1247,7 +1248,7 @@ dnl of the copyright holder. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.3.1]) +m4_define([vers_have], [1.3.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1775,11 +1776,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # Arrange that distcleancheck ignores ChangeLog left over by distclean. # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ -mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ +mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) +AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) ]) # XORG_CHANGELOG dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ diff --git a/xorg-server/compile b/xorg-server/compile new file mode 100644 index 000000000..1b1d23216 --- /dev/null +++ b/xorg-server/compile @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/xorg-server/composite/Makefile.in b/xorg-server/composite/Makefile.in index aa18bdb6c..acc09ef9b 100644 --- a/xorg-server/composite/Makefile.in +++ b/xorg-server/composite/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -270,7 +267,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -284,7 +280,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -370,6 +363,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -401,7 +395,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c index 4267a51c7..9bc43b05b 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.c @@ -99,7 +99,7 @@ static Bool compRepaintBorder (ClientPtr pClient, pointer closure) { WindowPtr pWindow; - int rc = dixLookupWindow(&pWindow, (XID)closure, pClient, DixWriteAccess); + int rc = dixLookupWindow(&pWindow, (XID)(intptr_t)closure, pClient, DixWriteAccess); if (rc == Success) { RegionRec exposed; @@ -130,7 +130,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data) SetBorderSize (pWindow); if (HasBorder (pWindow)) QueueWorkProc (compRepaintBorder, serverClient, - (pointer) pWindow->drawable.id); + (pointer)(intptr_t) pWindow->drawable.id); return WT_WALKCHILDREN; } diff --git a/xorg-server/config.guess b/xorg-server/config.guess index da8331460..e3a2116a7 100644 --- a/xorg-server/config.guess +++ b/xorg-server/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -656,7 +656,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -822,6 +822,9 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -882,40 +885,17 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -947,7 +927,7 @@ EOF EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; @@ -1001,14 +981,6 @@ EOF elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1074,7 +1046,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1182,7 +1154,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) diff --git a/xorg-server/config.sub b/xorg-server/config.sub index a39437d01..eb0389a69 100644 --- a/xorg-server/config.sub +++ b/xorg-server/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -153,6 +153,9 @@ case $os in os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -467,6 +470,10 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -1260,7 +1267,7 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1613,7 +1620,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff --git a/xorg-server/config/Makefile.in b/xorg-server/config/Makefile.in index 6e4bbc3c2..73ce38585 100644 --- a/xorg-server/config/Makefile.in +++ b/xorg-server/config/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -277,7 +274,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -291,7 +287,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -377,6 +370,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -408,7 +402,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/configure b/xorg-server/configure index 3e56daba7..e07db83d7 100644 --- a/xorg-server/configure +++ b/xorg-server/configure @@ -1,20 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xorg-server 1.7.0.902. +# Generated by GNU Autoconf 2.64 for xorg-server 1.7.99.1. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -46,7 +40,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +57,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +89,15 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -116,12 +109,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -133,7 +130,250 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -147,8 +387,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -168,409 +412,120 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# 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 -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit } -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. +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 as_func_ret_success; then - : +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 - exitcode=1 - echo as_func_ret_success failed. + as_ln_s='cp -p' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - exitcode=1 - echo positional parameters were not saved. + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi +as_executable_p=$as_test_x -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - 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 - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# 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'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# 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'" +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -740,14 +695,14 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.7.0.902' -PACKAGE_STRING='xorg-server 1.7.0.902' +PACKAGE_VERSION='1.7.99.1' +PACKAGE_STRING='xorg-server 1.7.99.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_URL='' ac_unique_file="Makefile.am" # Factoring default headers for most tests. @@ -790,27 +745,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -Q -V -F77 -FC -CXX -AM_MAKEFLAGS -MAKEFLAGS -shavedir -CHANGELOG_CMD -ADMIN_MAN_DIR -DRIVER_MAN_DIR -MISC_MAN_DIR -FILE_MAN_DIR -LIB_MAN_DIR -APP_MAN_DIR -ADMIN_MAN_SUFFIX -DRIVER_MAN_SUFFIX -MISC_MAN_SUFFIX -FILE_MAN_SUFFIX -LIB_MAN_SUFFIX -APP_MAN_SUFFIX DIX_CFLAGS BUILD_TIME BUILD_DATE @@ -821,8 +755,6 @@ BUILD_KDRIVEFBDEVLIB_FALSE BUILD_KDRIVEFBDEVLIB_TRUE XEPHYR_FALSE XEPHYR_TRUE -XSDLSERVER_FALSE -XSDLSERVER_TRUE KDRIVEFBDEV_FALSE KDRIVEFBDEV_TRUE KDRIVEVESA_FALSE @@ -837,8 +769,6 @@ KDRIVE_PURE_LIBS KDRIVE_CFLAGS KDRIVE_PURE_INCS KDRIVE_INCS -XSDL_INCS -XSDL_LIBS XEPHYR_INCS XEPHYR_LIBS XEPHYR_CFLAGS @@ -850,6 +780,9 @@ DMX_BUILD_USB_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_LNX_TRUE +HAVE_DOXYGEN_FALSE +HAVE_DOXYGEN_TRUE +DOXYGEN X11EXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS @@ -976,9 +909,6 @@ XVFB_LIBS XVFB_FALSE XVFB_TRUE LD_EXPORT_SYMBOLS_FLAG -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -CWARNFLAGS UTILS_SYS_LIBS XSERVER_SYS_LIBS XSERVER_LIBS @@ -1151,6 +1081,23 @@ SPECIAL_DTRACE_OBJECTS_TRUE XSERVER_DTRACE_FALSE XSERVER_DTRACE_TRUE DTRACE +ADMIN_MAN_DIR +DRIVER_MAN_DIR +MISC_MAN_DIR +FILE_MAN_DIR +LIB_MAN_DIR +APP_MAN_DIR +ADMIN_MAN_SUFFIX +DRIVER_MAN_SUFFIX +MISC_MAN_SUFFIX +FILE_MAN_SUFFIX +LIB_MAN_SUFFIX +APP_MAN_SUFFIX +distcleancheck_listfiles +CHANGELOG_CMD +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +CWARNFLAGS RAWCPPFLAGS RAWCPP YFLAGS @@ -1269,6 +1216,7 @@ bindir program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -1288,8 +1236,10 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_largefile -with_dtrace +enable_silent_rules +enable_strict_compilation with_release_version +with_dtrace enable_werror enable_debug enable_unit_tests @@ -1366,7 +1316,6 @@ enable_standalone_xpbproxy enable_xwin enable_kdrive enable_xephyr -enable_xsdl enable_xfake enable_xfbdev enable_install_setuid @@ -1375,8 +1324,7 @@ enable_tcp_transport enable_ipv6 enable_local_transport enable_secure_rpc -enable_silent_rules -enable_shave +with_xkb_bin_directory ' ac_precious_vars='build_alias host_alias @@ -1558,8 +1506,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1585,8 +1532,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1790,8 +1736,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1807,8 +1752,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1838,17 +1782,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1865,15 +1809,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1896,8 +1838,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1927,11 +1868,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1970,13 +1909,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -2002,7 +1939,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.7.0.902 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.7.99.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2072,7 +2009,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.7.0.902:";; + short | recursive ) echo "Configuration of xorg-server 1.7.99.1:";; esac cat <<\_ACEOF @@ -2090,7 +2027,12 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --enable-werror Treat warnings as errors (default: disabled) + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') + --enable-strict-compilation + Enable all warnings from compiler and make them + errors (default: disabled) + --enable-werror Obsolete - use --enable-strict-compilation instead --enable-debug Enable debugging (default: disabled) --enable-unit-tests Enable unit-tests (default: auto) --enable-use-sigio-by-default @@ -2151,16 +2093,17 @@ Optional Features: --enable-xwin Build XWin server (default: auto) --enable-kdrive Build kdrive servers (default: no) --enable-xephyr Build the kdrive Xephyr server (default: auto) - --enable-xsdl Build the kdrive Xsdl server (default: auto) --enable-xfake Build the kdrive 'fake' server (default: auto) --enable-xfbdev Build the kdrive framebuffer device server (default: auto) --enable-install-setuid Install Xorg server as owned by root with setuid bit (default: auto) + --enable-unix-transport Enable UNIX domain socket transport + --enable-tcp-transport Enable TCP socket transport + --enable-ipv6 Enable IPv6 support + --enable-local-transport + Enable os-specific local transport --enable-secure-rpc Enable Secure RPC - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --enable-shave use shave to make the build pretty [default=yes] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2168,10 +2111,10 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-dtrace=PATH Enable dtrace probes (default: enabled if dtrace - found) --with-release-version=STRING Use release version string in package name + --with-dtrace=PATH Enable dtrace probes (default: enabled if dtrace + found) --with-int10=BACKEND int10 backend: vm86, x86emu or stub --with-vendor-name=VENDOR Vendor string reported by the server @@ -2221,6 +2164,8 @@ Optional Packages: org.x) --with-dri-driver-path=PATH Path to DRI drivers (default: ${libdir}/dri) + --with-xkb-bin-directory=DIR + Directory containing xkbcomp program Some influential environment variables: CC C compiler command @@ -2404,5595 +2349,1044 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.7.0.902 -generated by GNU Autoconf 2.63 +xorg-server configure 1.7.99.1 +generated by GNU Autoconf 2.64 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.7.0.902, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## - $ $0 $@ - -_ACEOF -exec 5>>config.log +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -_ASUNAME +} # ac_fn_c_try_compile -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -} >&5 + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -cat >&5 <<_ACEOF +} # ac_fn_c_try_link +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -## ----------- ## -## Core tests. ## -## ----------- ## +} # ac_fn_c_check_header_compile -_ACEOF +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +} # ac_fn_c_try_cpp -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# 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. - { - echo +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +} # ac_fn_c_try_run - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +#ifdef __STDC__ +# include +#else +# include +#endif -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +#undef $2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_func -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - +# ac_fn_c_check_decl LINENO SYMBOL VAR +# ------------------------------------ +# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +$as_echo_n "checking whether $2 is declared... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $2 + (void) $2; +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_decl -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_header_compiler=no fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ---------------------------------------------------------------------- ## +## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## +## ---------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_header_mongrel +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_type +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_member +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +It was created by xorg-server $as_me 1.7.99.1, which was +generated by GNU Autoconf 2.64. Invocation command line was + $ $0 $@ +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +_ASUNAME - -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 - - -RELEASE_DATE="2009-10-19" - -am__api_version='1.11' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL 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. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +} >&5 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +cat >&5 <<_ACEOF -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; -esac +## ----------- ## +## Core tests. ## +## ----------- ## -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then +_ACEOF - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -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_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -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_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # 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. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -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_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='xorg-server' - VERSION='1.7.0.902' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - -ac_config_files="$ac_config_files shave shave-libtool" - - -# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and -# XORG_CWARNFLAGS - - - - - - - - - - - - -ac_config_headers="$ac_config_headers include/do-not-use-config.h" - -ac_config_headers="$ac_config_headers include/xorg-server.h" - -ac_config_headers="$ac_config_headers include/dix-config.h" - -ac_config_headers="$ac_config_headers include/xorg-config.h" - -ac_config_headers="$ac_config_headers include/xkb-config.h" - -ac_config_headers="$ac_config_headers include/xwin-config.h" - -ac_config_headers="$ac_config_headers include/kdrive-config.h" - -ac_config_headers="$ac_config_headers include/version-config.h" - - -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 -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -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_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -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_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -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_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=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 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -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_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -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_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $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: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) 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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -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); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $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: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -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>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - 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_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - 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_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - 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_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -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 -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -# By default we simply use the C compiler to build assembly code. - -test "${CCAS+set}" = set || CCAS=$CC -test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - - - -depcc="$CCAS" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CCAS_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CCAS_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CCAS_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } -CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then - am__fastdepCCAS_TRUE= - am__fastdepCCAS_FALSE='#' -else - am__fastdepCCAS_TRUE='#' - am__fastdepCCAS_FALSE= -fi - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL 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. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AS+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -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_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:$LINENO: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -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_prog_ac_ct_AS="as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -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_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -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_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -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_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -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_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; -esac - -test -z "$AS" && AS=as - - - - - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - - - - - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.2.6' -macro_revision='1.3012' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - 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_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - 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" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - 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" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -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_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -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_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5764: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:5767: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:5770: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -# find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -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_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -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_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -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_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -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_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -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_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -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_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -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_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -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_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - $as_echo_n "(cached) " >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } -fi - - - - - - - - - - - - - - - - - - - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 6962 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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 - *\"* | *\`* | *\\*) 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 - lt_cv_cc_needs_belf=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -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 - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -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_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -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_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -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_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -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_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -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_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -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_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -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_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -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_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -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_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 - *\"* | *\`* | *\\*) 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 - lt_cv_ld_exported_symbols_list=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -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 how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} -rm -f conftest.err conftest.$ac_ext +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# 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. + { + echo - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo - # Passes both tests. -ac_preproc_ok=: -break -fi + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo -rm -f conftest.err conftest.$ac_ext + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi +ac_signal=0 - done - ac_cv_prog_CPP=$CPP +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -rm -f conftest.err conftest.$ac_ext +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" _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 - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done -rm -f conftest.err conftest.$ac_ext +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8001,2429 +3395,2877 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$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 +RELEASE_DATE="2009-10-22)" + +am__api_version='1.11' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done +done +if test -z "$ac_aux_dir"; then + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then : $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. */ -#include -#include -#include -#include + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac -int -main () -{ + done +IFS=$as_save_IFS - ; - 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_cv_header_stdc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rm -rf conftest.one conftest.two conftest.dir - ac_cv_header_stdc=no fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL 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. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 + fi -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + test "$2" = conftest.file + ) +then + # Ok. + : else - ac_cv_header_stdc=no -fi -rm -f conftest* - + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - ac_cv_header_stdc=no + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -rm -f conftest* +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -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 - : +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $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. */ -#include -#include -#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 -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 - : + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 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 +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_prog_STRIP="${ac_tool_prefix}strip" + $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 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +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_prog_ac_ct_STRIP="strip" + $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 -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + 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 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + STRIP=$ac_ct_STRIP + fi else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + STRIP="$ac_cv_prog_STRIP" +fi - eval "$as_ac_Header=no" fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # 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. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } -done - - +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac -for ac_header in dlfcn.h +for ac_prog in gawk mawk nawk awk do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_prog_AWK="$ac_prog" + $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 - eval "$as_ac_Header=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -done - - - -# Set options - - - - enable_dlopen=no - + test -n "$AWK" && break +done - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else - enable_shared=yes + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make fi - - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= else - pic_mode=default + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" fi - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - enable_fast_install=yes + am__leading_dot=_ fi +rmdir .tst 2>/dev/null +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +# Define the identity of the package. + PACKAGE='xorg-server' + VERSION='1.7.99.1' +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF +# Some tools Automake needs. - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. +AMTAR=${AMTAR-"${am_missing_run}tar"} -test -z "$LN_S" && LN_S="ln -s" +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE +# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +ac_config_headers="$ac_config_headers include/do-not-use-config.h" +ac_config_headers="$ac_config_headers include/xorg-server.h" +ac_config_headers="$ac_config_headers include/dix-config.h" +ac_config_headers="$ac_config_headers include/xorg-config.h" +ac_config_headers="$ac_config_headers include/xkb-config.h" +ac_config_headers="$ac_config_headers include/xwin-config.h" +ac_config_headers="$ac_config_headers include/kdrive-config.h" +ac_config_headers="$ac_config_headers include/version-config.h" +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 -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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_prog_CC="${ac_tool_prefix}gcc" + $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 +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +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_prog_ac_ct_CC="gcc" + $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 +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; + if test "x$ac_ct_CC" = x; then + CC="" + 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 + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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_prog_CC="${ac_tool_prefix}cc" + $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 -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -# Global variables: -ofile=libtool -can_build_shared=yes +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -old_CC="$CC" -old_CFLAGS="$CFLAGS" +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +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_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - + done +IFS=$as_save_IFS -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + 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 + CC=$ac_ct_CC + fi fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 + ac_file='' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +fi +ac_exeext=$ac_cv_exeext -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - else - MAGIC_CMD=: - fi -fi +int +main () +{ - fi - ;; + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -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}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Source file extension for C test sources. -ac_ext=c +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -# Object file extension for compiled C test sources. -objext=o -objext=$objext + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -# Allow CC to be a program name with arguments. -compiler=$CC +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +fi -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* +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 +DEPDIR="${am__leading_dot}deps" +ac_config_commands="$ac_config_commands depfiles" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then -lt_prog_compiler_no_builtin_flag= +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8787: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:8791: \$? = $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_rtti_exceptions=yes - fi - fi - $RM conftest* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' fi - + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= fi +depcc="$CC" am_compiler_list= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break fi ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# By default we simply use the C compiler to build assembly code. - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; +depcc="$CCAS" am_compiler_list= - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; + am_cv_CCAS_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CCAS_dependencies_compiler_type=$depmode + break + fi + fi + done - rdos*) - lt_prog_compiler_static='-non_shared' - ;; + cd .. + rm -rf conftest.dir +else + am_cv_CCAS_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then + am__fastdepCCAS_TRUE= + am__fastdepCCAS_FALSE='#' +else + am__fastdepCCAS_TRUE='#' + am__fastdepCCAS_FALSE= +fi - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +enable_win32_dll=yes +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else +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_prog_AS="${ac_tool_prefix}as" + $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 +fi +fi +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +fi +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9126: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:9130: \$? = $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=yes - fi - fi - $RM conftest* + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +else +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_prog_ac_ct_AS="as" + $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 fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac + if test "x$ac_ct_AS" = x; then + AS="false" + 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 + AS=$ac_ct_AS + fi else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no + AS="$ac_cv_prog_AS" fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +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_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $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 + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_static_works=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=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +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_prog_ac_ct_DLLTOOL="dlltool" + $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 fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - lt_prog_compiler_static= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + 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 + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi - - - - - - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9231: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:9235: \$? = $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=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* + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +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_prog_OBJDUMP="${ac_tool_prefix}objdump" + $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 fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9286: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:9290: \$? = $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=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* + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +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_prog_ac_ct_OBJDUMP="objdump" + $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 fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_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:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + 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 + OBJDUMP=$ac_ct_OBJDUMP fi else - need_locks=no + OBJDUMP="$ac_cv_prog_OBJDUMP" fi + ;; +esac + +test -z "$AS" && AS=as + + +test -z "$DLLTOOL" && DLLTOOL=dlltool - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +test -z "$OBJDUMP" && OBJDUMP=objdump - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -_LT_EOF - fi - ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi + +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" ;; + esac +else + enable_static=no +fi + - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - gnu* | linux* | tpf* | k*bsd*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 +macro_version='2.2.6' +macro_revision='1.3012' -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$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='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ +ltmain="$ac_aux_dir/ltmain.sh" - ; - 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;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; 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 -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" -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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $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 + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; 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 -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $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 + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - darwin* | rhapsody*) - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - ld_shlibs=no - fi - ;; - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +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_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in "dumpbin -symbols" "link -dump -symbols" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +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_prog_ac_ct_DUMPBIN="$ac_prog" + $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 +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&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 + + test -n "$ac_ct_DUMPBIN" && break +done + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + 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 + DUMPBIN=$ac_ct_DUMPBIN + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - *nto* | *qnx*) - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:6069: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:6072: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:6075: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; esac - link_all_deplibs=yes - ;; + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; +fi - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } - *) - ld_shlibs=no - ;; - esac - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no -with_gnu_ld=$with_gnu_ld +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac @@ -10433,111 +6275,339 @@ with_gnu_ld=$with_gnu_ld +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds 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:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; -esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +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_prog_OBJDUMP="${ac_tool_prefix}objdump" + $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 +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +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_prog_ac_ct_OBJDUMP="objdump" + $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 +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + 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 + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi +test -z "$OBJDUMP" && OBJDUMP=objdump +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; +beos*) + lt_cv_deplibs_check_method=pass_all + ;; +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -10550,12 +6620,100 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +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_prog_AR="${ac_tool_prefix}ar" + $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 +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +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_prog_ac_ct_AR="ar" + $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 +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_AR" = x; then + AR="false" + 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 + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -10567,31 +6725,220 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +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_prog_STRIP="${ac_tool_prefix}strip" + $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 +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +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_prog_ac_ct_STRIP="strip" + $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 +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + 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 + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi +test -z "$STRIP" && STRIP=: +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +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_prog_RANLIB="${ac_tool_prefix}ranlib" + $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 +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +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_prog_ac_ct_RANLIB="ranlib" + $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 +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + 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 + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi +test -z "$RANLIB" && RANLIB=: +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi @@ -10626,462 +6973,401 @@ esac +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +# Allow CC to be a program name with arguments. +compiler=$CC +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 +else +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + # Check to see that the pipe works correctly. + pipe_works=no + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + 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; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + cat <<_LT_EOF >> conftest.$ac_ext +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +fi +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -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.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; -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 - ;; -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -freebsd1*) - dynamic_linker=no - ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { 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; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; esac fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes + rm -rf conftest* ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 7267 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes + fi + rm -rf conftest* ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > 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; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes + fi + rm -rf conftest* ;; -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + 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 -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11092,298 +7378,516 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes -fi - +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_cc_needs_belf=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - 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 - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $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' - ;; - -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 - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -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 - ;; - -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" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi ;; + esac + ;; esac fi - sys_lib_dlsearch_path_spec='/usr/lib' + rm -rf conftest* ;; +esac -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 - ;; +need_locks="$enable_libtool_lock" -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $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 -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 - -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" +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +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_prog_ac_ct_DSYMUTIL="dsymutil" + $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 +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + 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 + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +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_prog_NMEDIT="${ac_tool_prefix}nmedit" + $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 +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +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_prog_ac_ct_NMEDIT="nmedit" + $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 +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + 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 + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +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_prog_LIPO="${ac_tool_prefix}lipo" + $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 +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +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_prog_ac_ct_LIPO="lipo" + $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 +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + 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 + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +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_prog_OTOOL="${ac_tool_prefix}otool" + $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 +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +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_prog_ac_ct_OTOOL="otool" + $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 +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + 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 + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +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_prog_OTOOL64="${ac_tool_prefix}otool64" + $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 +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +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_prog_ac_ct_OTOOL64="otool64" + $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 +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + 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 + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi @@ -11406,885 +7910,555 @@ fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat 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 dlopen (); int main () { -return dlopen (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + lt_cv_ld_exported_symbols_list=no fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi ;; + esac - *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then +ac_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 how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then : $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 + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} + Syntax error _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : - ac_cv_func_shl_load=no +else + # Broken: fails on valid input. +continue fi +rm -f conftest.err 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 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + 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 shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_shl_load=yes +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext - ac_cv_lib_dld_shl_load=no +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break 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 + done + ac_cv_prog_CPP=$CPP + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 + CPP=$ac_cv_prog_CPP else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext -int -main () -{ -return dlopen (); - ; - return 0; -} + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } +fi + +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 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include +#include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); int main () { -return dlopen (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +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 + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : - ac_cv_lib_dl_dlopen=no +else + ac_cv_header_stdc=no fi +rm -f conftest* -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + +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 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_svld_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : - ac_cv_lib_svld_dlopen=no +else + ac_cv_header_stdc=no fi +rm -f conftest* -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_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - $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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - 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" +#include +#include +#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 -char dld_link (); + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -return dld_link (); - ; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_dld_link=yes +if ac_fn_c_try_run "$LINENO"; then : + 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 + +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 + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h - ac_cv_lib_dld_dld_link=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi +done -fi +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF fi +done -fi -fi +# Set options + + + + enable_dlopen=no + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes fi - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 12089 "configure" -#include "confdefs.h" + pic_mode=default +fi -#if HAVE_DLFCN_H -#include -#endif -#include +test -z "$pic_mode" && pic_mode=default -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi +else + enable_fast_install=yes fi -rm -fr conftest* -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 12185 "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF @@ -12299,99 +8473,232 @@ fi -striplib= -old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $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; } - fi - ;; - *) - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +# Global variables: +ofile=libtool +can_build_shared=yes +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +with_gnu_ld="$lt_cv_prog_gnu_ld" - # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } +old_CC="$CC" +old_CFLAGS="$CFLAGS" - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break fi - ;; + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no +_LT_EOF + fi ;; + esac + fi + break fi - ;; - esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + else + MAGIC_CMD=: + fi +fi + fi + ;; +esac +# Use C for the default configuration in the libtool script -fi +lt_save_CC="$CC" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +# Source file extension for C test sources. +ac_ext=c +# Object file extension for compiled C test sources. +objext=o +objext=$objext +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' @@ -12399,1790 +8706,1619 @@ CC="$lt_save_CC" +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - ac_config_commands="$ac_config_commands libtool" +# Allow CC to be a program name with arguments. +compiler=$CC +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* -# Only expand once: +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then +lt_prog_compiler_no_builtin_flag= +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' -# dolt, a replacement for libtool -# Josh Triplett -# Extract the first word of "bash", so it can be a program name with args. -set dummy bash; 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_DOLT_BASH+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $DOLT_BASH in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOLT_BASH="$DOLT_BASH" # 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_DOLT_BASH="$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 + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:8765: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:8769: \$? = $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_rtti_exceptions=yes + fi + fi + $RM conftest* - ;; -esac fi -DOLT_BASH=$ac_cv_path_DOLT_BASH -if test -n "$DOLT_BASH"; then - { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5 -$as_echo "$DOLT_BASH" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + : fi - -{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5 -$as_echo_n "checking if dolt supports this host... " >&6; } -dolt_supported=yes -if test x$DOLT_BASH = x; then - dolt_supported=no -fi -if test x$GCC != xyes; then - dolt_supported=no fi -case $host in -i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ -|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) - pic_options='-fPIC' - ;; -i?86-pc-cygwin*) - pic_options='-DDLL_EXPORT' - ;; -i?86-apple-darwin*) - pic_options='-fno-common' - ;; -*) - dolt_supported=no - ;; -esac -if test x$dolt_supported = xno ; then - { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5 -$as_echo "no, falling back to libtool" >&6; } - LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' - LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -else - { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5 -$as_echo "yes, replacing libtool" >&6; } - cat <<__DOLTCOMPILE__EOF__ >doltcompile -#!$DOLT_BASH -__DOLTCOMPILE__EOF__ - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -args=("$@") -for ((arg=0; arg<${#args[@]}; arg++)) ; do - if test x"${args[$arg]}" = x-o ; then - objarg=$((arg+1)) - break - fi -done -if test x$objarg = x ; then - echo 'Error: no -o on compiler command line' 1>&2 - exit 1 -fi -lo="${args[$objarg]}" -obj="${lo%.lo}" -if test x"$lo" = x"$obj" ; then - echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 - exit 1 -fi -objbase="${obj##*/}" -__DOLTCOMPILE__EOF__ - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -libobjdir="${obj%$objbase}.libs" -if test ! -d "$libobjdir" ; then - mkdir_out="$(mkdir "$libobjdir" 2>&1)" - mkdir_ret=$? - if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then - echo "$mkdir_out" 1>&2 - exit $mkdir_ret - fi -fi -pic_object="$libobjdir/$objbase.o" -args[$objarg]="$pic_object" -__DOLTCOMPILE__EOF__ - cat <<__DOLTCOMPILE__EOF__ >>doltcompile -"\${args[@]}" $pic_options -DPIC || exit \$? -__DOLTCOMPILE__EOF__ - fi - if test x$enable_static = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -non_pic_object="$obj.o" -args[$objarg]="$non_pic_object" -__DOLTCOMPILE__EOF__ - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args[@]}" >/dev/null 2>&1 || exit $? -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args[@]}" || exit $? -__DOLTCOMPILE__EOF__ - fi - fi - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -{ -echo "# $lo - a libtool object file" -echo "# Generated by doltcompile, not libtool" -__DOLTCOMPILE__EOF__ - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "pic_object='.libs/${objbase}.o'" -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo pic_object=none -__DOLTCOMPILE__EOF__ - fi - if test x$enable_static = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "non_pic_object='${objbase}.o'" -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo non_pic_object=none -__DOLTCOMPILE__EOF__ - fi + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -} > "$lo" -__DOLTCOMPILE__EOF__ + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; - chmod +x doltcompile - LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' - LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; - cat <<__DOLTLIBTOOL__EOF__ > doltlibtool -#!$DOLT_BASH -__DOLTLIBTOOL__EOF__ - cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool -top_builddir_slash="${0%%doltlibtool}" -: ${top_builddir_slash:=./} -args=() -modeok=false -tagok=false -for arg in "$@"; do - case "$arg" in - --silent) ;; - --mode=compile) modeok=true ;; - --tag=CC|--tag=CXX) tagok=true ;; - *) args[${#args[@]}]="$arg" ;; - esac -done -if $modeok && $tagok ; then - . ${top_builddir_slash}doltcompile "${args[@]}" -else - exec ${top_builddir_slash}libtool "$@" -fi -__DOLTLIBTOOL__EOF__ + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; - chmod +x doltlibtool - LIBTOOL='$(top_builddir)/doltlibtool' -fi + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; -# end dolt + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + linux* | k*bsd*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -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:$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 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + rdos*) + lt_prog_compiler_static='-non_shared' + ;; - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: 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 + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -fi -for ac_prog in flex lex -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # Let the user override the test. -else -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_prog_LEX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; -fi -fi -LEX=$ac_cv_prog_LEX -if test -n "$LEX"; then - { $as_echo "$as_me:$LINENO: result: $LEX" >&5 -$as_echo "$LEX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; - test -n "$LEX" && break -done -test -n "$LEX" || LEX=":" + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%% -a { ECHO; } -b { REJECT; } -c { yymore (); } -d { yyless (1); } -e { yyless (input () != 0); } -f { unput (yytext[0]); } -. { BEGIN INITIAL; } -%% -#ifdef YYTEXT_POINTER -extern char *yytext; -#endif -int -main (void) -{ - return ! yylex () + ! yywrap (); -} -_ACEOF -{ (ac_try="$LEX conftest.l" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$LEX conftest.l") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5 -$as_echo_n "checking lex output file root... " >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then - $as_echo_n "(cached) " >&6 -else +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy -else - { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -$as_echo "$ac_cv_prog_lex_root" >&6; } -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test -z "${LEXLIB+set}"; then - { $as_echo "$as_me:$LINENO: checking lex library" >&5 -$as_echo_n "checking lex library... " >&6; } -if test "${ac_cv_lib_lex+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_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_lex=$ac_lib -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9104: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:9108: \$? = $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=yes + fi + fi + $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 -$as_echo "$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -$as_echo_n "checking whether yytext is a pointer... " >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 -`cat $LEX_OUTPUT_ROOT.c` -_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_prog_lex_yytext_pointer=yes +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=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_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } -if test $ac_cv_prog_lex_yytext_pointer = yes; then -cat >>confdefs.h <<\_ACEOF -#define YYTEXT_POINTER 1 -_ACEOF -fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c -fi -for ac_prog in 'bison -y' byacc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else -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_prog_YACC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + lt_cv_prog_compiler_static_works=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=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - { $as_echo "$as_me:$LINENO: result: $YACC" >&5 -$as_echo "$YACC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + lt_prog_compiler_static= fi - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval=$enable_largefile; -fi -if test "$enable_largefile" != no; then - { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - 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 - break + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9209: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9213: \$? = $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=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" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - 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_cv_sys_largefile_CC=' -n32'; break + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9264: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:9268: \$? = $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=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" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then - $as_echo_n "(cached) " >&6 -else - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - 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_cv_sys_file_offset_bits=no; break + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + need_locks=no +fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - 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_cv_sys_file_offset_bits=64; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -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; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then - $as_echo_n "(cached) " >&6 -else - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= - ; - 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_cv_sys_large_files=no; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; + esac + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -fi + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 - ; - 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_cv_sys_large_files=1; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. +_LT_EOF + fi + ;; -fi + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* - fi -fi + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; -for ac_prog in cpp -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RAWCPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $RAWCPP in - [\\/]* | ?:[\\/]*) - ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" -for as_dir in $as_dummy -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_RAWCPP="$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 + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; - ;; -esac -fi -RAWCPP=$ac_cv_path_RAWCPP -if test -n "$RAWCPP"; then - { $as_echo "$as_me:$LINENO: result: $RAWCPP" >&5 -$as_echo "$RAWCPP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + gnu* | linux* | tpf* | k*bsd*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi - test -n "$RAWCPP" && break -done -test -n "$RAWCPP" || RAWCPP="${CPP}" + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -# Check for flag to avoid builtin definitions - assumes unix is predefined, -# which is not the best choice for supporting other OS'es, but covers most -# of the ones we need for now. -{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -undef" >&5 -$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -Does cpp redefine unix ? -_ACEOF -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -else - if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - RAWCPPFLAGS=-undef - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - # under Cygwin unix is still defined even with -undef - elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - RAWCPPFLAGS="-undef -ansi" - { $as_echo "$as_me:$LINENO: result: yes, with -ansi" >&5 -$as_echo "yes, with -ansi" >&6; } - else - { { $as_echo "$as_me:$LINENO: error: ${RAWCPP} defines unix with or without -undef. I don't know what to do." >&5 -$as_echo "$as_me: error: ${RAWCPP} defines unix with or without -undef. I don't know what to do." >&2;} - { (exit 1); exit 1; }; } - fi -fi -rm -f conftest.$ac_ext + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; -{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -traditional" >&5 -$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -Does cpp preserve "whitespace"? -_ACEOF -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { { $as_echo "$as_me:$LINENO: error: ${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." >&5 -$as_echo "$as_me: error: ${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." >&2;} - { (exit 1); exit 1; }; } - fi -fi -rm -f conftest.$ac_ext + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; 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_SED+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $SED in - [\\/]* | ?:[\\/]*) - ac_cv_path_SED="$SED" # 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_SED="$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 +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; - ;; -esac -fi -SED=$ac_cv_path_SED -if test -n "$SED"; then - { $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$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='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -# Check whether --with-dtrace was given. -if test "${with_dtrace+set}" = set; then - withval=$with_dtrace; WDTRACE=$withval -else - WDTRACE=auto -fi + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then - # Extract the first word of "dtrace", so it can be a program name with args. -set dummy dtrace; 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_DTRACE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $DTRACE in - [\\/]* | ?:[\\/]*) - ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin" -for as_dir in $as_dummy -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_DTRACE="$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 + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi - test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not_found" - ;; -esac -fi -DTRACE=$ac_cv_path_DTRACE -if test -n "$DTRACE"; then - { $as_echo "$as_me:$LINENO: result: $DTRACE" >&5 -$as_echo "$DTRACE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' - if test "x$DTRACE" = "xnot_found" ; then - if test "x$WDTRACE" = "xyes" ; 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: dtrace requested but not found -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: dtrace requested but not found -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - WDTRACE="no" + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' else - if test "${ac_cv_header_sys_sdt_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5 -$as_echo_n "checking for sys/sdt.h... " >&6; } -if test "${ac_cv_header_sys_sdt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5 -$as_echo "$ac_cv_header_sys_sdt_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/sdt.h usability" >&5 -$as_echo_n "checking sys/sdt.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi - ac_header_compiler=no -fi + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -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; } +int +main () +{ -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/sdt.h presence" >&5 -$as_echo_n "checking sys/sdt.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + ; + 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 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : - ac_header_preproc=no +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end 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: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5 -$as_echo_n "checking for sys/sdt.h... " >&6; } -if test "${ac_cv_header_sys_sdt_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_sys_sdt_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5 -$as_echo "$ac_cv_header_sys_sdt_h" >&6; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -if test "x$ac_cv_header_sys_sdt_h" = x""yes; then - HAS_SDT_H="yes" -else - HAS_SDT_H="no" fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then - WDTRACE="no" - fi + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi -fi -if test "x$WDTRACE" != "xno" ; then + fi + ;; -cat >>confdefs.h <<\_ACEOF -#define XSERVER_DTRACE 1 -_ACEOF + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; -# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into -# object files, and require linking with those as relocatable objects, not .a -# archives. MacOS X handles all this in the normal compiler toolchain, and on -# some releases (like Tiger), will error out on dtrace -G. For now, other -# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux -# ports appear to, based on my web searches, but have not yet been tested). - case $host_os in - darwin*) SPECIAL_DTRACE_OBJECTS=no ;; - *) SPECIAL_DTRACE_OBJECTS=yes ;; - esac -fi - if test "x$WDTRACE" != "xno"; then - XSERVER_DTRACE_TRUE= - XSERVER_DTRACE_FALSE='#' -else - XSERVER_DTRACE_TRUE='#' - XSERVER_DTRACE_FALSE= -fi + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; - if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"; then - SPECIAL_DTRACE_OBJECTS_TRUE= - SPECIAL_DTRACE_OBJECTS_FALSE='#' -else - SPECIAL_DTRACE_OBJECTS_TRUE='#' - SPECIAL_DTRACE_OBJECTS_FALSE= -fi + darwin* | rhapsody*) + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + ld_shlibs=no + fi + ;; + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + freebsd1*) + ld_shlibs=no + ;; -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include <$ac_hdr> + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -int -main () -{ -if ((DIR *) 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 - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; - eval "$as_ac_Header=no" -fi + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -_ACEOF + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes -ac_header_dirent=$ac_hdr; break -fi + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char opendir (); -int -main () -{ -return opendir (); - ; - return 0; -} -_ACEOF -for ac_lib in '' dir; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval 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_search_opendir=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' -fi + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then - break -fi -done -if test "${ac_cv_search_opendir+set}" = set; then - : -else - ac_cv_search_opendir=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } -ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo(void) {} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; -else - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char opendir (); -int -main () -{ -return opendir (); - ; - return 0; -} -_ACEOF -for ac_lib in '' x; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval 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_search_opendir=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; -fi + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then - break -fi -done -if test "${ac_cv_search_opendir+set}" = set; then - : -else - ac_cv_search_opendir=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } -ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; -fi + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -fi + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; -{ $as_echo "$as_me:$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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; -int -main () -{ + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; - ; - 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_cv_header_stdc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; - ac_cv_header_stdc=no -fi + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -fi + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -_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* + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -fi + *) + ld_shlibs=no + ;; + esac -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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#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 + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi -#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 -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +with_gnu_ld=$with_gnu_ld -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF -fi @@ -14190,1954 +10326,907 @@ fi -for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=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 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: ) - { $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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; + 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 + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$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" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+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. */ -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - ; - 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_cv_c_const=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const /**/ -_ACEOF -fi - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; -_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 - # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif - ; - 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 - # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ; - 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_cv_c_bigendian=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif - ; - 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 - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -#ifndef _BIG_ENDIAN - not big endian - #endif - ; - 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_cv_c_bigendian=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then - # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; -int -main () -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - 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 grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - ; - 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_c_bigendian=no -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_c_bigendian=yes -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - ENDIAN="X_BIG_ENDIAN";; #( - no) - ENDIAN="X_LITTLE_ENDIAN" ;; #( - universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF - ;; #( - *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; - esac -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5 -$as_echo_n "checking size of unsigned long... " >&6; } -if test "${ac_cv_sizeof_unsigned_long+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -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 -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)]; -test_array [0] = 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_lo=0 ac_mid=0 - while :; do - 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 -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; -test_array [0] = 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_hi=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - 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 -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)]; -test_array [0] = 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_hi=-1 ac_mid=-1 - while :; do - 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 -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)]; -test_array [0] = 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_lo=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - 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 -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; -test_array [0] = 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_hi=$ac_mid -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') if test "$ac_cv_type_unsigned_long" = yes; 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: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_unsigned_long=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (unsigned long)); } -static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); } -#include -#include -int -main () -{ - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (unsigned long))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (unsigned long)))) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (unsigned long)))) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 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_sizeof_unsigned_long=`cat conftest.val` -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 ) -if test "$ac_cv_type_unsigned_long" = yes; 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: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_unsigned_long=0 - fi -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF -if test "$ac_cv_sizeof_unsigned_long" = 8; then -cat >>confdefs.h <<\_ACEOF -#define _XSERVER64 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5 -$as_echo_n "checking for pid_t... " >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pid_t=no -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 -int -main () -{ -if (sizeof (pid_t)) - 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 - 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 -int -main () -{ -if (sizeof ((pid_t))) - 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 - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_pid_t=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -$as_echo "$ac_cv_type_pid_t" >&6; } -if test "x$ac_cv_type_pid_t" = x""yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF -fi -# Checks for headers/macros for byte swapping -# Known variants: -# bswap_16, bswap_32, bswap_64 (glibc) -# __swap16, __swap32, __swap64 (OpenBSD) -# bswap16, bswap32, bswap64 (other BSD's) -# and a fallback to local macros if none of the above are found -# if is found, assume it's the correct version -for ac_header in byteswap.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -# if is found, have to check which version -if test "${ac_cv_header_sys_endian_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5 -$as_echo_n "checking for sys/endian.h... " >&6; } -if test "${ac_cv_header_sys_endian_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5 -$as_echo "$ac_cv_header_sys_endian_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/endian.h usability" >&5 -$as_echo_n "checking sys/endian.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/endian.h presence" >&5 -$as_echo_n "checking sys/endian.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5 -$as_echo_n "checking for sys/endian.h... " >&6; } -if test "${ac_cv_header_sys_endian_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_sys_endian_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5 -$as_echo "$ac_cv_header_sys_endian_h" >&6; } -fi -if test "x$ac_cv_header_sys_endian_h" = x""yes; then - HAVE_SYS_ENDIAN_H="yes" -else - HAVE_SYS_ENDIAN_H="no" -fi -if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then - { $as_echo "$as_me:$LINENO: checking for __swap16 variant of byteswapping macros" >&5 -$as_echo_n "checking for __swap16 variant of byteswapping macros... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -int a = 1, b; -b = __swap16(a); - ; - 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 - SYS_ENDIAN__SWAP='yes' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - SYS_ENDIAN__SWAP='no' + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi +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 -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN__SWAP" >&5 -$as_echo "$SYS_ENDIAN__SWAP" >&6; } - - { $as_echo "$as_me:$LINENO: checking for bswap16 variant of byteswapping macros" >&5 -$as_echo_n "checking for bswap16 variant of byteswapping macros... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - -int a = 1, b; -b = bswap16(a); - - ; - return 0; -} +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -_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 - SYS_ENDIAN_BSWAP='yes' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH - SYS_ENDIAN_BSWAP='no' -fi + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN_BSWAP" >&5 -$as_echo "$SYS_ENDIAN_BSWAP" >&6; } +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.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; - if test "$SYS_ENDIAN_BSWAP" = "yes" ; then - USE_SYS_ENDIAN_H=yes - BSWAP=bswap - else - if test "$SYS_ENDIAN__SWAP" = "yes" ; then - USE_SYS_ENDIAN_H=yes - BSWAP=__swap - else - USE_SYS_ENDIAN_H=no - fi - 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 + ;; - if test "$USE_SYS_ENDIAN_H" = "yes" ; then +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -cat >>confdefs.h <<\_ACEOF -#define USE_SYS_ENDIAN_H 1 -_ACEOF +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -cat >>confdefs.h <<_ACEOF -#define bswap_16 ${BSWAP}16 -_ACEOF + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; -cat >>confdefs.h <<_ACEOF -#define bswap_32 ${BSWAP}32 -_ACEOF + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -cat >>confdefs.h <<_ACEOF -#define bswap_64 ${BSWAP}64 -_ACEOF + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; - fi -fi +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -{ $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen +freebsd1*) + dynamic_linker=no + ;; -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; -#ifdef __STDC__ -# include -#else -# include -#endif +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; -#undef dlopen +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; - ac_cv_func_dlopen=no -fi +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then - : -else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + 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 dlopen (); int main () { -return dlopen (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - DLOPEN_LIBS="-ldl" fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir -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' + ;; -for ac_func in vprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +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' + ;; -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +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 + ;; -#ifdef __STDC__ -# include -#else -# include -#endif +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 + ;; -#undef $ac_func +*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' + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +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 + ;; -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 + ;; - eval "$as_ac_var=no" -fi +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" + ;; -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 +rdos*) + dynamic_linker=no + ;; -{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 -$as_echo_n "checking for _doprnt... " >&6; } -if test "${ac_cv_func__doprnt+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 _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt +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' + ;; -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +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 + ;; -#ifdef __STDC__ -# include -#else -# include -#endif +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' + ;; -#undef _doprnt +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 + ;; -/* 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 _doprnt (); -/* 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__doprnt || defined __stub____doprnt -choke me -#endif +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 + ;; -int -main () -{ -return _doprnt (); - ; - 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;; +*) + dynamic_linker=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_func__doprnt=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func__doprnt=no -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF +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 -done - - - - - @@ -16154,884 +11243,156 @@ done -for ac_func in geteuid getuid link memmove memset mkstemp strchr strrchr \ - strtol getopt getopt_long vsnprintf walkcontext backtrace \ - getisax getzoneid shmctl64 strcasestr ffs -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+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. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - if (p) return 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_working_alloca_h=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_working_alloca_h=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_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } -if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+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. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif -int -main () -{ -char *p = (char *) alloca (1); - if (p) return 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_func_alloca_works=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_alloca_works=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_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } -if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+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. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - break -fi - done -fi -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} -int -main () -{ - return find_stack_direction () < 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_c_stack_direction=1 -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_c_stack_direction=-1 -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for getdtablesize" >&5 -$as_echo_n "checking for getdtablesize... " >&6; } -if test "${ac_cv_func_getdtablesize+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 getdtablesize to an innocuous variant, in case declares getdtablesize. - For example, HP-UX 11i declares gettimeofday. */ -#define getdtablesize innocuous_getdtablesize -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getdtablesize (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef getdtablesize -/* 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 getdtablesize (); -/* 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_getdtablesize || defined __stub___getdtablesize -choke me -#endif -int -main () -{ -return getdtablesize (); - ; - 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_getdtablesize=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_getdtablesize=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_getdtablesize" >&5 -$as_echo "$ac_cv_func_getdtablesize" >&6; } -if test "x$ac_cv_func_getdtablesize" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define HAS_GETDTABLESIZE 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for getifaddrs" >&5 -$as_echo_n "checking for getifaddrs... " >&6; } -if test "${ac_cv_func_getifaddrs+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 getifaddrs to an innocuous variant, in case declares getifaddrs. - For example, HP-UX 11i declares gettimeofday. */ -#define getifaddrs innocuous_getifaddrs -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getifaddrs (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef getifaddrs -/* 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 getifaddrs (); -/* 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_getifaddrs || defined __stub___getifaddrs -choke me -#endif -int -main () -{ -return getifaddrs (); - ; - 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_getifaddrs=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_getifaddrs=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_getifaddrs" >&5 -$as_echo "$ac_cv_func_getifaddrs" >&6; } -if test "x$ac_cv_func_getifaddrs" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define HAS_GETIFADDRS 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for getpeereid" >&5 -$as_echo_n "checking for getpeereid... " >&6; } -if test "${ac_cv_func_getpeereid+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 getpeereid to an innocuous variant, in case declares getpeereid. - For example, HP-UX 11i declares gettimeofday. */ -#define getpeereid innocuous_getpeereid -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpeereid (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef getpeereid -/* 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 getpeereid (); -/* 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_getpeereid || defined __stub___getpeereid -choke me -#endif -int -main () -{ -return getpeereid (); - ; - 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_getpeereid=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_getpeereid=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpeereid" >&5 -$as_echo "$ac_cv_func_getpeereid" >&6; } -if test "x$ac_cv_func_getpeereid" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAS_GETPEEREID 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi -{ $as_echo "$as_me:$LINENO: checking for getpeerucred" >&5 -$as_echo_n "checking for getpeerucred... " >&6; } -if test "${ac_cv_func_getpeerucred+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 getpeerucred to an innocuous variant, in case declares getpeerucred. - For example, HP-UX 11i declares gettimeofday. */ -#define getpeerucred innocuous_getpeerucred -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpeerucred (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef getpeerucred -/* 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 getpeerucred (); -/* 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_getpeerucred || defined __stub___getpeerucred -choke me -#endif -int -main () -{ -return getpeerucred (); - ; - 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_getpeerucred=yes + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_getpeerucred=no -fi + lt_cv_dlopen=no + lt_cv_dlopen_libs= -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_getpeerucred" >&5 -$as_echo "$ac_cv_func_getpeerucred" >&6; } -if test "x$ac_cv_func_getpeerucred" = x""yes; then + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -cat >>confdefs.h <<\_ACEOF -#define HAS_GETPEERUCRED 1 -_ACEOF + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -fi + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -{ $as_echo "$as_me:$LINENO: checking for strlcat" >&5 -$as_echo_n "checking for strlcat... " >&6; } -if test "${ac_cv_func_strlcat+set}" = set; then + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else - 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="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define strlcat to an innocuous variant, in case declares strlcat. - For example, HP-UX 11i declares gettimeofday. */ -#define strlcat innocuous_strlcat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strlcat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef strlcat /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -17039,98 +11400,52 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char strlcat (); -/* 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_strlcat || defined __stub___strlcat -choke me -#endif - +char dlopen (); int main () { -return strlcat (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_strlcat=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strlcat=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcat" >&5 -$as_echo "$ac_cv_func_strlcat" >&6; } -if test "x$ac_cv_func_strlcat" = x""yes; then - HAVE_STRLCAT=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - HAVE_STRLCAT=no -fi - if test x$HAVE_STRLCAT = xno; then - NEED_STRLCAT_TRUE= - NEED_STRLCAT_FALSE='#' -else - NEED_STRLCAT_TRUE='#' - NEED_STRLCAT_FALSE= + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + fi -{ $as_echo "$as_me:$LINENO: checking for strlcpy" >&5 -$as_echo_n "checking for strlcpy... " >&6; } -if test "${ac_cv_func_strlcpy+set}" = set; then + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define strlcpy to an innocuous variant, in case declares strlcpy. - For example, HP-UX 11i declares gettimeofday. */ -#define strlcpy innocuous_strlcpy - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strlcpy (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef strlcpy /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -17138,102 +11453,42 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char strlcpy (); -/* 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_strlcpy || defined __stub___strlcpy -choke me -#endif - +char shl_load (); int main () { -return strlcpy (); +return shl_load (); ; 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_strlcpy=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strlcpy=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_lib_dld_shl_load=no fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcpy" >&5 -$as_echo "$ac_cv_func_strlcpy" >&6; } -if test "x$ac_cv_func_strlcpy" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAS_STRLCPY 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - - - if test x$HAVE_VSNPRINTF = xno; then - NEED_VSNPRINTF_TRUE= - NEED_VSNPRINTF_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - NEED_VSNPRINTF_TRUE='#' - NEED_VSNPRINTF_FALSE= -fi - - -{ $as_echo "$as_me:$LINENO: checking for mmap" >&5 -$as_echo_n "checking for mmap... " >&6; } -if test "${ac_cv_func_mmap+set}" = set; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else - 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="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define mmap to an innocuous variant, in case declares mmap. - For example, HP-UX 11i declares gettimeofday. */ -#define mmap innocuous_mmap - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mmap (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef mmap /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -17241,79 +11496,37 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char mmap (); -/* 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_mmap || defined __stub___mmap -choke me -#endif - +char dlopen (); int main () { -return mmap (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_mmap=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_mmap=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_lib_dl_dlopen=no fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 -$as_echo "$ac_cv_func_mmap" >&6; } -if test "x$ac_cv_func_mmap" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAS_MMAP 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:$LINENO: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if test "${ac_cv_lib_m_sqrt+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -17322,72 +11535,37 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char sqrt (); +char dlopen (); int main () { -return sqrt (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_m_sqrt=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_sqrt=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -fi - -{ $as_echo "$as_me:$LINENO: checking for cbrt in -lm" >&5 -$as_echo_n "checking for cbrt in -lm... " >&6; } -if test "${ac_cv_lib_m_cbrt+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -17396,3069 +11574,2883 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char cbrt (); +char dld_link (); int main () { -return cbrt (); +return dld_link (); ; 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_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 11647 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 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_m_cbrt=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 11743 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif - ac_cv_lib_m_cbrt=no +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi fi +rm -fr conftest* + -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_m_cbrt" >&5 -$as_echo "$ac_cv_lib_m_cbrt" >&6; } -if test "x$ac_cv_lib_m_cbrt" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_CBRT 1 -_ACEOF + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac fi -for ac_header in ndbm.h dbm.h rpcsvc/dbm.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $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 ;; - 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; -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" + esac fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -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 "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no -# 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - AGP=yes -fi + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } - if test "x$AGP" = xyes; then - AGP_TRUE= - AGP_FALSE='#' -else - AGP_TRUE='#' - AGP_FALSE= -fi -for ac_header in linux/apm_bios.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - LNXAPM=yes -fi -done - if test "x$LNXAPM" = xyes; then - LNXAPM_TRUE= - LNXAPM_FALSE='#' -else - LNXAPM_TRUE='#' - LNXAPM_FALSE= -fi -for ac_header in linux/fb.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_config_commands="$ac_config_commands libtool" - 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 + +# Only expand once: + + + + +# dolt, a replacement for libtool +# Josh Triplett +# Extract the first word of "bash", so it can be a program name with args. +set dummy bash; 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_DOLT_BASH+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $DOLT_BASH in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOLT_BASH="$DOLT_BASH" # 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_DOLT_BASH="$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 - ac_header_preproc=no + ;; +esac +fi +DOLT_BASH=$ac_cv_path_DOLT_BASH +if test -n "$DOLT_BASH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5 +$as_echo "$DOLT_BASH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5 +$as_echo_n "checking if dolt supports this host... " >&6; } +dolt_supported=yes +if test x$DOLT_BASH = x; then + dolt_supported=no +fi +if test x$GCC != xyes; then + dolt_supported=no +fi +case $host in +i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ +|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) + pic_options='-fPIC' ;; - 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 +i?86-pc-cygwin*) + pic_options='-DDLL_EXPORT' + ;; +i?86-apple-darwin*) + pic_options='-fno-common' + ;; +*) + dolt_supported=no ;; 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 +if test x$dolt_supported = xno ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5 +$as_echo "no, falling back to libtool" >&6; } + LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' + LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' else - eval "$as_ac_Header=\$ac_header_preproc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5 +$as_echo "yes, replacing libtool" >&6; } + + cat <<__DOLTCOMPILE__EOF__ >doltcompile +#!$DOLT_BASH +__DOLTCOMPILE__EOF__ + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +args=("$@") +for ((arg=0; arg<${#args[@]}; arg++)) ; do + if test x"${args[$arg]}" = x-o ; then + objarg=$((arg+1)) + break + fi +done +if test x$objarg = x ; then + echo 'Error: no -o on compiler command line' 1>&2 + exit 1 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; } +lo="${args[$objarg]}" +obj="${lo%.lo}" +if test x"$lo" = x"$obj" ; then + echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 + exit 1 +fi +objbase="${obj##*/}" +__DOLTCOMPILE__EOF__ + + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +libobjdir="${obj%$objbase}.libs" +if test ! -d "$libobjdir" ; then + mkdir_out="$(mkdir "$libobjdir" 2>&1)" + mkdir_ret=$? + if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then + echo "$mkdir_out" 1>&2 + exit $mkdir_ret + fi +fi +pic_object="$libobjdir/$objbase.o" +args[$objarg]="$pic_object" +__DOLTCOMPILE__EOF__ + cat <<__DOLTCOMPILE__EOF__ >>doltcompile +"\${args[@]}" $pic_options -DPIC || exit \$? +__DOLTCOMPILE__EOF__ + fi + + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +non_pic_object="$obj.o" +args[$objarg]="$non_pic_object" +__DOLTCOMPILE__EOF__ + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args[@]}" >/dev/null 2>&1 || exit $? +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args[@]}" || exit $? +__DOLTCOMPILE__EOF__ + fi + fi + + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +{ +echo "# $lo - a libtool object file" +echo "# Generated by doltcompile, not libtool" +__DOLTCOMPILE__EOF__ + + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "pic_object='.libs/${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo pic_object=none +__DOLTCOMPILE__EOF__ + fi + + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "non_pic_object='${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo non_pic_object=none +__DOLTCOMPILE__EOF__ + fi + + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +} > "$lo" +__DOLTCOMPILE__EOF__ -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 - FBDEV=yes -fi + chmod +x doltcompile + LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' + LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool +#!$DOLT_BASH +__DOLTLIBTOOL__EOF__ + cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool +top_builddir_slash="${0%%doltlibtool}" +: ${top_builddir_slash:=./} +args=() +modeok=false +tagok=false +for arg in "$@"; do + case "$arg" in + --silent) ;; + --mode=compile) modeok=true ;; + --tag=CC|--tag=CXX) tagok=true ;; + *) args[${#args[@]}]="$arg" ;; + esac done - - if test "x$FBDEV" = xyes; then - FBDEVHW_TRUE= - FBDEVHW_FALSE='#' +if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args[@]}" else - FBDEVHW_TRUE='#' - FBDEVHW_FALSE= + exec ${top_builddir_slash}libtool "$@" +fi +__DOLTLIBTOOL__EOF__ + + chmod +x doltlibtool + LIBTOOL='$(top_builddir)/doltlibtool' fi +# end dolt -for ac_header in asm/mtrr.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 ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $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> + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' _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;; +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; 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 +rm -f conftest.make 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 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 + +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 - 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; } + 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 -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_cv_asm_mtrr_h=yes +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 -done -if test "x$ac_cv_asm_mtrr_h" = xyes; then - HAVE_MTRR=yes fi - - -for ac_header in sys/memrange.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 +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 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } + 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 -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 +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 - eval "$as_ac_Header=\$ac_header_preproc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&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; } + 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 -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_cv_memrange_h=yes -fi - -done -if test "x$ac_cv_memrange_h" = xyes; then - HAVE_MTRR=yes fi - -if test "x$HAVE_MTRR" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAS_MTRR_SUPPORT 1 -_ACEOF +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 - - -for ac_header in machine/mtrr.h +for ac_prog in flex lex 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 + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LEX+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_prog_LEX="$ac_prog" + $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 - ac_header_compiler=no +fi +fi +LEX=$ac_cv_prog_LEX +if test -n "$LEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +$as_echo "$LEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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> + test -n "$LEX" && break +done +test -n "$LEX" || LEX=":" + +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%% +a { ECHO; } +b { REJECT; } +c { yymore (); } +d { yyless (1); } +e { yyless (input () != 0); } +f { unput (yytext[0]); } +. { BEGIN INITIAL; } +%% +#ifdef YYTEXT_POINTER +extern char *yytext; +#endif +int +main (void) +{ + return ! yylex () + ! yywrap (); +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +{ { ac_try="$LEX conftest.l" 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 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$LEX conftest.l") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 +$as_echo_n "checking lex output file root... " >&6; } +if test "${ac_cv_prog_lex_root+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +else + as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +$as_echo "$ac_cv_prog_lex_root" >&6; } +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 +if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 +$as_echo_n "checking lex library... " >&6; } +if test "${ac_cv_lib_lex+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 + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +`cat $LEX_OUTPUT_ROOT.c` _ACEOF - ac_cv_machine_mtrr_h=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lex=$ac_lib fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + test "$ac_cv_lib_lex" != 'none needed' && break + done + LIBS=$ac_save_LIBS -done - -if test "x$ac_cv_machine_mtrr_h" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAS_MTRR_BUILTIN 1 -_ACEOF - +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +$as_echo "$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex fi -for ac_header in sys/linker.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +$as_echo_n "checking whether yytext is a pointer... " >&6; } +if test "${ac_cv_prog_lex_yytext_pointer+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 + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - -#include <$ac_header> +#define YYTEXT_POINTER 1 +`cat $LEX_OUTPUT_ROOT.c` _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_prog_lex_yytext_pointer=yes fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - ac_cv_sys_linker_h=yes -else - ac_cv_sys_linker_h=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +if test $ac_cv_prog_lex_yytext_pointer = yes; then -done +$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h - if test "x$ac_cv_sys_linker_h" = xyes; then - FREEBSD_KLDLOAD_TRUE= - FREEBSD_KLDLOAD_FALSE='#' -else - FREEBSD_KLDLOAD_TRUE='#' - FREEBSD_KLDLOAD_FALSE= fi +rm -f conftest.l $LEX_OUTPUT_ROOT.c - -{ $as_echo "$as_me:$LINENO: checking for SYSV IPC" >&5 -$as_echo_n "checking for SYSV IPC... " >&6; } -if test "${ac_cv_sysv_ipc+set}" = set; then +fi +for ac_prog in 'bison -y' byacc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_YACC+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. */ - -#include -#include -#include - -int -main () -{ - -{ - int id; - id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); - if (id < 0) return -1; - return shmctl(id, IPC_RMID, 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_sysv_ipc=yes + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_prog_YACC="$ac_prog" + $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 - ac_cv_sysv_ipc=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_sysv_ipc" >&5 -$as_echo "$ac_cv_sysv_ipc" >&6; } -if test "x$ac_cv_sysv_ipc" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYSV_IPC 1 -_ACEOF - +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test -c /dev/xf86 ; then -cat >>confdefs.h <<\_ACEOF -#define HAS_APERTURE_DRV 1 -_ACEOF + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; fi -if test "${ac_cv_header_machine_apmvar_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5 -$as_echo_n "checking for machine/apmvar.h... " >&6; } -if test "${ac_cv_header_machine_apmvar_h+set}" = set; then +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5 -$as_echo "$ac_cv_header_machine_apmvar_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h usability" >&5 -$as_echo_n "checking machine/apmvar.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h presence" >&5 -$as_echo_n "checking machine/apmvar.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + ; + 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 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + if ac_fn_c_try_compile "$LINENO"; then : + break 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: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5 -$as_echo_n "checking for machine/apmvar.h... " >&6; } -if test "${ac_cv_header_machine_apmvar_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_machine_apmvar_h=$ac_header_preproc +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5 -$as_echo "$ac_cv_header_machine_apmvar_h" >&6; } - +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi fi -if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi - if test "${ac_cv_header_sys_event_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5 -$as_echo_n "checking for sys/event.h... " >&6; } -if test "${ac_cv_header_sys_event_h+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5 -$as_echo "$ac_cv_header_sys_event_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/event.h usability" >&5 -$as_echo_n "checking sys/event.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ - ac_header_compiler=no + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break 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 sys/event.h presence" >&5 -$as_echo_n "checking sys/event.h presence... " >&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. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ - ac_header_preproc=no + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break 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: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sys/event.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sys/event.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sys/event.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sys/event.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sys/event.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sys/event.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; esac -{ $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5 -$as_echo_n "checking for sys/event.h... " >&6; } -if test "${ac_cv_header_sys_event_h+set}" = set; then +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_header_sys_event_h=$ac_header_preproc + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5 -$as_echo "$ac_cv_header_sys_event_h" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break fi -if test "x$ac_cv_header_sys_event_h" = x""yes; then - ac_cv_BSD_KQUEUE_APM=yes -else - ac_cv_BSD_APM=yes +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done fi - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi fi - if test "x$ac_cv_BSD_APM" = xyes; then - BSD_APM_TRUE= - BSD_APM_FALSE='#' +for ac_prog in cpp +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_RAWCPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else - BSD_APM_TRUE='#' - BSD_APM_FALSE= -fi + case $RAWCPP in + [\\/]* | ?:[\\/]*) + ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" +for as_dir in $as_dummy +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_RAWCPP="$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 - if test "x$ac_cv_BSD_KQUEUE_APM" = xyes; then - BSD_KQUEUE_APM_TRUE= - BSD_KQUEUE_APM_FALSE='#' + ;; +esac +fi +RAWCPP=$ac_cv_path_RAWCPP +if test -n "$RAWCPP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 +$as_echo "$RAWCPP" >&6; } else - BSD_KQUEUE_APM_TRUE='#' - BSD_KQUEUE_APM_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "${ac_cv_header_execinfo_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5 -$as_echo_n "checking for execinfo.h... " >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -$as_echo "$ac_cv_header_execinfo_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking execinfo.h usability" >&5 -$as_echo_n "checking execinfo.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + test -n "$RAWCPP" && break +done +test -n "$RAWCPP" || RAWCPP="${CPP}" + + +# Check for flag to avoid builtin definitions - assumes unix is predefined, +# which is not the best choice for supporting other OS'es, but covers most +# of the ones we need for now. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 +$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include +Does cpp redefine unix ? _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 test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS=-undef + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + # under Cygwin unix is still defined even with -undef + elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS="-undef -ansi" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 +$as_echo "yes, with -ansi" >&6; } + else + as_fn_error "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5 + fi fi +rm -f 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 execinfo.h presence" >&5 -$as_echo_n "checking execinfo.h presence... " >&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 if $RAWCPP requires -traditional" >&5 +$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +Does cpp preserve "whitespace"? _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 test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + as_fn_error "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5 + fi fi +rm -f conftest.$ac_ext -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: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: execinfo.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5 -$as_echo_n "checking for execinfo.h... " >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then +# Extract the first word of "sed", so it can be a program name with args. +set dummy sed; 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_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_header_execinfo_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -$as_echo "$ac_cv_header_execinfo_h" >&6; } + case $SED in + [\\/]* | ?:[\\/]*) + ac_cv_path_SED="$SED" # 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_SED="$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 +SED=$ac_cv_path_SED +if test -n "$SED"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x$ac_cv_header_execinfo_h" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for backtrace in -lc" >&5 -$as_echo_n "checking for backtrace in -lc... " >&6; } -if test "${ac_cv_lib_c_backtrace+set}" = set; then + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if test "${ac_cv_prog_cc_c99+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include +#include +#include -/* 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" +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; #endif -char backtrace (); +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + int main () { -return backtrace (); + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + ; 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_c_backtrace=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC - ac_cv_lib_c_backtrace=no fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; 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_c_backtrace" >&5 -$as_echo "$ac_cv_lib_c_backtrace" >&6; } -if test "x$ac_cv_lib_c_backtrace" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_BACKTRACE 1 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define HAVE_EXECINFO_H 1 -_ACEOF +if test "x$GCC" = xyes ; then + CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ +-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ +-Wbad-function-cast" + case `$CC -dumpversion` in + 3.4.* | 4.*) + CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" + ;; + esac +else + ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : + SUNCC="yes" +else + SUNCC="no" fi - + if test "x$SUNCC" = "xyes"; then + CWARNFLAGS="-v" + fi fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' -DEFAULT_INT10="x86emu" - - -case $host_cpu in - alpha*) - ALPHA_VIDEO=yes - case $host_os in - *freebsd*) SYS_LIBS=-lio ;; - *netbsd*) -cat >>confdefs.h <<\_ACEOF -#define USE_ALPHA_PIO 1 -_ACEOF - ;; - esac - GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" - ;; - arm*) - ARM_VIDEO=yes - ;; - i*86) - I386_VIDEO=yes - case $host_os in - *freebsd*) cat >>confdefs.h <<\_ACEOF -#define USE_DEV_IO 1 -_ACEOF - ;; - *dragonfly*) cat >>confdefs.h <<\_ACEOF -#define USE_DEV_IO 1 -_ACEOF - ;; - *netbsd*) cat >>confdefs.h <<\_ACEOF -#define USE_I386_IOPL 1 -_ACEOF - SYS_LIBS=-li386 - ;; - *openbsd*) cat >>confdefs.h <<\_ACEOF -#define USE_I386_IOPL 1 -_ACEOF - SYS_LIBS=-li386 - ;; - esac - ;; - powerpc*) - PPC_VIDEO=yes - case $host_os in - *freebsd*) DEFAULT_INT10=stub ;; - esac - ;; - sparc*) - SPARC64_VIDEO=yes - BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - x86_64*|amd64*) - I386_VIDEO=yes - case $host_os in - *freebsd*) -cat >>confdefs.h <<\_ACEOF -#define USE_DEV_IO 1 -_ACEOF - ;; - *dragonfly*) -cat >>confdefs.h <<\_ACEOF -#define USE_DEV_IO 1 -_ACEOF - ;; - *netbsd*) -cat >>confdefs.h <<\_ACEOF -#define USE_I386_IOPL 1 -_ACEOF - SYS_LIBS=-lx86_64 - ;; - *openbsd*) -cat >>confdefs.h <<\_ACEOF -#define USE_AMD64_IOPL 1 -_ACEOF - SYS_LIBS=-lamd64 - ;; - esac - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - ia64*) - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - s390*) - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; -esac - if test "x$ALPHA_VIDEO" = xyes; then - ALPHA_VIDEO_TRUE= - ALPHA_VIDEO_FALSE='#' +# Check whether --enable-strict-compilation was given. +if test "${enable_strict_compilation+set}" = set; then : + enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval else - ALPHA_VIDEO_TRUE='#' - ALPHA_VIDEO_FALSE= + STRICT_COMPILE=no fi - if test "x$ARM_VIDEO" = xyes; then - ARM_VIDEO_TRUE= - ARM_VIDEO_FALSE='#' +if test "x$STRICT_COMPILE" = "xyes"; then + ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : + SUNCC="yes" else - ARM_VIDEO_TRUE='#' - ARM_VIDEO_FALSE= + SUNCC="no" fi - if test "x$I386_VIDEO" = xyes; then - I386_VIDEO_TRUE= - I386_VIDEO_FALSE='#' + ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = x""yes; then : + INTELCC="yes" else - I386_VIDEO_TRUE='#' - I386_VIDEO_FALSE= + INTELCC="no" fi - if test "x$PPC_VIDEO" = xyes; then - PPC_VIDEO_TRUE= - PPC_VIDEO_FALSE='#' -else - PPC_VIDEO_TRUE='#' - PPC_VIDEO_FALSE= + if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" + elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" + fi fi +CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" - if test "x$SPARC64_VIDEO" = xyes; then - SPARC64_VIDEO_TRUE= - SPARC64_VIDEO_FALSE='#' -else - SPARC64_VIDEO_TRUE='#' - SPARC64_VIDEO_FALSE= -fi -DRI=no -USE_SIGIO_BY_DEFAULT="yes" -case $host_os in - *freebsd* | *dragonfly*) - case $host_os in - kfreebsd*-gnu) ;; - *) -cat >>confdefs.h <<\_ACEOF -#define CSRG_BASED 1 -_ACEOF - ;; - esac -cat >>confdefs.h <<\_ACEOF -#define PCCONS_SUPPORT 1 -_ACEOF +# Check whether --with-release-version was given. +if test "${with_release_version+set}" = set; then : + withval=$with_release_version; RELEASE_VERSION="$withval" +else + RELEASE_VERSION="" +fi + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + { $as_echo "$as_me:${as_lineno-$LINENO}: Building with package name set to $PACKAGE" >&5 +$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} + fi -cat >>confdefs.h <<\_ACEOF -#define PCVT_SUPPORT 1 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + if test "x$PVM" = "x"; then + PVM="0" + fi -cat >>confdefs.h <<\_ACEOF -#define SYSCONS_SUPPORT 1 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM _ACEOF - DRI=yes - ;; - *netbsd*) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + if test "x$PVP" = "x"; then + PVP="0" + fi -cat >>confdefs.h <<\_ACEOF -#define CSRG_BASED 1 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP _ACEOF -cat >>confdefs.h <<\_ACEOF -#define PCCONS_SUPPORT 1 -_ACEOF +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ +mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" -cat >>confdefs.h <<\_ACEOF -#define PCVT_SUPPORT 1 -_ACEOF +distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' -cat >>confdefs.h <<\_ACEOF -#define WSCONS_SUPPORT 1 -_ACEOF - DRI=yes - ;; - *openbsd*) -cat >>confdefs.h <<\_ACEOF -#define CSRG_BASED 1 -_ACEOF +if test x$APP_MAN_SUFFIX = x ; then + APP_MAN_SUFFIX=1 +fi +if test x$APP_MAN_DIR = x ; then + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +fi -cat >>confdefs.h <<\_ACEOF -#define PCVT_SUPPORT 1 -_ACEOF +if test x$LIB_MAN_SUFFIX = x ; then + LIB_MAN_SUFFIX=3 +fi +if test x$LIB_MAN_DIR = x ; then + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +fi +if test x$FILE_MAN_SUFFIX = x ; then + case $host_os in + solaris*) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; + esac +fi +if test x$FILE_MAN_DIR = x ; then + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +fi -cat >>confdefs.h <<\_ACEOF -#define WSCONS_SUPPORT 1 -_ACEOF +if test x$MISC_MAN_SUFFIX = x ; then + case $host_os in + solaris*) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; + esac +fi +if test x$MISC_MAN_DIR = x ; then + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +fi - ;; - *linux*) - DRI=yes - ;; - *solaris*) - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm\"") >&5 - ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - DRI=yes -else - DRI=no +if test x$DRIVER_MAN_SUFFIX = x ; then + case $host_os in + solaris*) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; + esac +fi +if test x$DRIVER_MAN_DIR = x ; then + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +fi + +if test x$ADMIN_MAN_SUFFIX = x ; then + case $host_os in + solaris*) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; + esac +fi +if test x$ADMIN_MAN_DIR = x ; then + ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' fi - # Disable use of SIGIO by default until some system bugs are - # fixed - see Sun/OpenSolaris bug id 6879897 - USE_SIGIO_BY_DEFAULT="no" - ;; - darwin*) -cat >>confdefs.h <<\_ACEOF -#define CSRG_BASED 1 -_ACEOF - ;; -esac -# Check whether --with-release-version was given. -if test "${with_release_version+set}" = set; then - withval=$with_release_version; RELEASE_VERSION="$withval" -else - RELEASE_VERSION="" -fi - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 -$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} - fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` -_ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` - if test "x$PVM" = "x"; then - PVM="0" - fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` - if test "x$PVP" = "x"; then - PVP="0" - fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF -PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` -PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1` -if test "x$PVS" = "x"; then - PVS="0" -fi -VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)" -VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" -VENDOR_NAME="The X.Org Foundation" -VENDOR_NAME_SHORT="X.Org" -VENDOR_WEB="http://wiki.x.org" +# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow +# easier overrides at build time. +XSERVER_CFLAGS='$(CWARNFLAGS)' -# Check whether --enable-werror was given. -if test "${enable_werror+set}" = set; then - enableval=$enable_werror; WERROR=$enableval +# Check whether --with-dtrace was given. +if test "${with_dtrace+set}" = set; then : + withval=$with_dtrace; WDTRACE=$withval else - WERROR=no + WDTRACE=auto fi -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; DEBUGGING=$enableval +if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then + # Extract the first word of "dtrace", so it can be a program name with args. +set dummy dtrace; 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_DTRACE+set}" = set; then : + $as_echo_n "(cached) " >&6 else - DEBUGGING=no -fi + case $DTRACE in + [\\/]* | ?:[\\/]*) + ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/sbin" +for as_dir in $as_dummy +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_DTRACE="$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 -# Check whether --enable-unit-tests was given. -if test "${enable_unit_tests+set}" = set; then - enableval=$enable_unit_tests; UNITTESTS=$enableval -else - UNITTESTS=auto + test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not_found" + ;; +esac fi - -# Check whether --enable-sigio-default was given. -if test "${enable_sigio_default+set}" = set; then - enableval=$enable_sigio_default; USE_SIGIO_BY_DEFAULT=$enableval +DTRACE=$ac_cv_path_DTRACE +if test -n "$DTRACE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 +$as_echo "$DTRACE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Check whether --with-int10 was given. -if test "${with_int10+set}" = set; then - withval=$with_int10; INT10="$withval" + if test "x$DTRACE" = "xnot_found" ; then + if test "x$WDTRACE" = "xyes" ; 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 "dtrace requested but not found +See \`config.log' for more details." "$LINENO" 5; } + fi + WDTRACE="no" + else + ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sdt_h" = x""yes; then : + HAS_SDT_H="yes" else - INT10="$DEFAULT_INT10" + HAS_SDT_H="no" fi -# Check whether --with-vendor-name was given. -if test "${with_vendor_name+set}" = set; then - withval=$with_vendor_name; VENDOR_NAME="$withval" + if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then + WDTRACE="no" + fi + fi fi +if test "x$WDTRACE" != "xno" ; then - -# Check whether --with-vendor-name-short was given. -if test "${with_vendor_name_short+set}" = set; then - withval=$with_vendor_name_short; VENDOR_NAME_SHORT="$withval" -fi +$as_echo "#define XSERVER_DTRACE 1" >>confdefs.h -# Check whether --with-vendor-web was given. -if test "${with_vendor_web+set}" = set; then - withval=$with_vendor_web; VENDOR_WEB="$withval" +# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into +# object files, and require linking with those as relocatable objects, not .a +# archives. MacOS X handles all this in the normal compiler toolchain, and on +# some releases (like Tiger), will error out on dtrace -G. For now, other +# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux +# ports appear to, based on my web searches, but have not yet been tested). + case $host_os in + darwin*) SPECIAL_DTRACE_OBJECTS=no ;; + *) SPECIAL_DTRACE_OBJECTS=yes ;; + esac +fi + if test "x$WDTRACE" != "xno"; then + XSERVER_DTRACE_TRUE= + XSERVER_DTRACE_FALSE='#' +else + XSERVER_DTRACE_TRUE='#' + XSERVER_DTRACE_FALSE= fi - -# Check whether --with-module-dir was given. -if test "${with_module_dir+set}" = set; then - withval=$with_module_dir; moduledir="$withval" + if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"; then + SPECIAL_DTRACE_OBJECTS_TRUE= + SPECIAL_DTRACE_OBJECTS_FALSE='#' else - moduledir="${libdir}/xorg/modules" + SPECIAL_DTRACE_OBJECTS_TRUE='#' + SPECIAL_DTRACE_OBJECTS_FALSE= fi -# Check whether --with-log-dir was given. -if test "${with_log_dir+set}" = set; then - withval=$with_log_dir; logdir="$withval" +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else - logdir="$localstatedir/log" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include <$ac_hdr> + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" +else + eval "$as_ac_Header=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF +ac_header_dirent=$ac_hdr; break +fi -# Check whether --with-builder-addr was given. -if test "${with_builder_addr+set}" = set; then - withval=$with_builder_addr; BUILDERADDR="$withval" +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 else - BUILDERADDR="xorg@lists.freedesktop.org" -fi + ac_func_search_save_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 opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then : -# Check whether --with-os-name was given. -if test "${with_os_name+set}" = set; then - withval=$with_os_name; OSNAME="$withval" else - OSNAME=`uname -srm` + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi -# Check whether --with-os-vendor was given. -if test "${with_os_vendor+set}" = set; then - withval=$with_os_vendor; OSVENDOR="$withval" else - OSVENDOR="" -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_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 opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then : -# Check whether --with-builderstring was given. -if test "${with_builderstring+set}" = set; then - withval=$with_builderstring; BUILDERSTRING="$withval" +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi +fi -# Check whether --with-fontdir was given. -if test "${with_fontdir+set}" = set; then - withval=$with_fontdir; FONTDIR="$withval" +{ $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 - FONTDIR="${libdir}/X11/fonts" -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include -DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" -case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -esac +int +main () +{ -# Check whether --with-default-font-path was given. -if test "${with_default_font_path+set}" = set; then - withval=$with_default_font_path; FONTPATH="$withval" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - FONTPATH="${DEFAULT_FONT_PATH}" + 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 +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : -# Check whether --with-xkb-path was given. -if test "${with_xkb_path+set}" = set; then - withval=$with_xkb_path; XKBPATH="$withval" else - XKBPATH="${datadir}/X11/xkb" + ac_cv_header_stdc=no fi +rm -f conftest* - -# Check whether --with-xkb-output was given. -if test "${with_xkb_output+set}" = set; then - withval=$with_xkb_output; XKBOUTPUT="$withval" -else - XKBOUTPUT="compiled" 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 -# Check whether --with-default-xkb-rules was given. -if test "${with_default_xkb_rules+set}" = set; then - withval=$with_default_xkb_rules; XKB_DFLT_RULES="$withval" -else - XKB_DFLT_RULES="" -fi - +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : -# Check whether --with-default-xkb-model was given. -if test "${with_default_xkb_model+set}" = set; then - withval=$with_default_xkb_model; XKB_DFLT_MODEL="$withval" else - XKB_DFLT_MODEL="pc104" + ac_cv_header_stdc=no fi +rm -f conftest* +fi -# Check whether --with-default-xkb-layout was given. -if test "${with_default_xkb_layout+set}" = set; then - withval=$with_default_xkb_layout; XKB_DFLT_LAYOUT="$withval" +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 - XKB_DFLT_LAYOUT="us" -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#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 ac_fn_c_try_run "$LINENO"; then : -# Check whether --with-default-xkb-variant was given. -if test "${with_default_xkb_variant+set}" = set; then - withval=$with_default_xkb_variant; XKB_DFLT_VARIANT="$withval" else - XKB_DFLT_VARIANT="" + 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 - -# Check whether --with-default-xkb-options was given. -if test "${with_default_xkb_options+set}" = set; then - withval=$with_default_xkb_options; XKB_DFLT_OPTIONS="$withval" -else - XKB_DFLT_OPTIONS="" 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 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -# Check whether --with-serverconfig-path was given. -if test "${with_serverconfig_path+set}" = set; then - withval=$with_serverconfig_path; SERVERCONFIG="$withval" -else - SERVERCONFIG="${libdir}/xorg" fi +for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.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 -# Check whether --with-apple-applications-dir was given. -if test "${with_apple_applications_dir+set}" = set; then - withval=$with_apple_applications_dir; APPLE_APPLICATIONS_DIR="${withval}" -else - APPLE_APPLICATIONS_DIR="/Applications/Utilities" fi +done -# Check whether --with-apple-application-name was given. -if test "${with_apple_application_name+set}" = set; then - withval=$with_apple_application_name; APPLE_APPLICATION_NAME="${withval}" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - APPLE_APPLICATION_NAME="X11" -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif -# Check whether --with-launchd-id-prefix was given. -if test "${with_launchd_id_prefix+set}" = set; then - withval=$with_launchd_id_prefix; LAUNCHD_ID_PREFIX="${withval}" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes else - LAUNCHD_ID_PREFIX="org.x" + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; -cat >>confdefs.h <<_ACEOF -#define LAUNCHD_ID_PREFIX "$LAUNCHD_ID_PREFIX" _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -# Check whether --enable-sparkle was given. -if test "${enable_sparkle+set}" = set; then - enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" -else - XQUARTZ_SPARKLE="no" + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif -# Check whether --enable-builddocs was given. -if test "${enable_builddocs+set}" = set; then - enableval=$enable_builddocs; BUILDDOCS=$enableval -else - BUILDDOCS=no -fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include -# Check whether --enable-install-libxf86config was given. -if test "${enable_install_libxf86config+set}" = set; then - enableval=$enable_install_libxf86config; INSTALL_LIBXF86CONFIG=$enableval -else - INSTALL_LIBXF86CONFIG=no -fi +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif -# Check whether --enable-null-root-cursor was given. -if test "${enable_null_root_cursor+set}" = set; then - enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - NULL_ROOT_CURSOR=no + ac_cv_c_bigendian=no fi - -# Check whether --enable-visibility was given. -if test "${enable_visibility+set}" = set; then - enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval -else - SYMBOL_VISIBILITY=auto +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# Check whether --with-dri-driver-path was given. -if test "${with_dri_driver_path+set}" = set; then - withval=$with_dri_driver_path; DRI_DRIVER_PATH="$withval" -else - DRI_DRIVER_PATH="${libdir}/dri" -fi +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif -# Check whether --enable-aiglx was given. -if test "${enable_aiglx+set}" = set; then - enableval=$enable_aiglx; AIGLX=$enableval + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - AIGLX=yes + ac_cv_c_bigendian=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; -# Check whether --enable-glx-tls was given. -if test "${enable_glx_tls+set}" = set; then - enableval=$enable_glx_tls; GLX_USE_TLS=$enableval -else - GLX_USE_TLS=no +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; -# Check whether --enable-registry was given. -if test "${enable_registry+set}" = set; then - enableval=$enable_registry; XREGISTRY=$enableval + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no else - XREGISTRY=yes + ac_cv_c_bigendian=yes fi - -# Check whether --enable-composite was given. -if test "${enable_composite+set}" = set; then - enableval=$enable_composite; COMPOSITE=$enableval -else - COMPOSITE=yes +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -# Check whether --enable-mitshm was given. -if test "${enable_mitshm+set}" = set; then - enableval=$enable_mitshm; MITSHM=$enableval -else - MITSHM=yes + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + ENDIAN="X_BIG_ENDIAN";; #( + no) + ENDIAN="X_LITTLE_ENDIAN" ;; #( + universal) -# Check whether --enable-xres was given. -if test "${enable_xres+set}" = set; then - enableval=$enable_xres; RES=$enableval -else - RES=yes -fi +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Check whether --enable-record was given. -if test "${enable_record+set}" = set; then - enableval=$enable_record; RECORD=$enableval -else - RECORD=no -fi + ;; #( + *) + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac -# Check whether --enable-xv was given. -if test "${enable_xv+set}" = set; then - enableval=$enable_xv; XV=$enableval -else - XV=yes -fi -# Check whether --enable-xvmc was given. -if test "${enable_xvmc+set}" = set; then - enableval=$enable_xvmc; XVMC=$enableval +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 +$as_echo_n "checking size of unsigned long... " >&6; } +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then : + $as_echo_n "(cached) " >&6 else - XVMC=yes -fi + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : -# Check whether --enable-dga was given. -if test "${enable_dga+set}" = set; then - enableval=$enable_dga; DGA=$enableval else - DGA=auto + if test "$ac_cv_type_unsigned_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (unsigned long) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi -# Check whether --enable-screensaver was given. -if test "${enable_screensaver+set}" = set; then - enableval=$enable_screensaver; SCREENSAVER=$enableval -else - SCREENSAVER=yes fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 +$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } -# Check whether --enable-xdmcp was given. -if test "${enable_xdmcp+set}" = set; then - enableval=$enable_xdmcp; XDMCP=$enableval -else - XDMCP=auto -fi -# Check whether --enable-xdm-auth-1 was given. -if test "${enable_xdm_auth_1+set}" = set; then - enableval=$enable_xdm_auth_1; XDMAUTH=$enableval -else - XDMAUTH=auto -fi -# Check whether --enable-glx was given. -if test "${enable_glx+set}" = set; then - enableval=$enable_glx; GLX=$enableval -else - GLX=yes -fi +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +_ACEOF -# Check whether --enable-dri was given. -if test "${enable_dri+set}" = set; then - enableval=$enable_dri; DRI=$enableval -fi -# Check whether --enable-dri2 was given. -if test "${enable_dri2+set}" = set; then - enableval=$enable_dri2; DRI2=$enableval -else - DRI2=auto -fi +if test "$ac_cv_sizeof_unsigned_long" = 8; then -# Check whether --enable-xinerama was given. -if test "${enable_xinerama+set}" = set; then - enableval=$enable_xinerama; XINERAMA=$enableval -else - XINERAMA=yes -fi +$as_echo "#define _XSERVER64 1" >>confdefs.h -# Check whether --enable-xf86vidmode was given. -if test "${enable_xf86vidmode+set}" = set; then - enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval -else - XF86VIDMODE=auto fi -# Check whether --enable-xace was given. -if test "${enable_xace+set}" = set; then - enableval=$enable_xace; XACE=$enableval -else - XACE=yes -fi +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : -# Check whether --enable-xselinux was given. -if test "${enable_xselinux+set}" = set; then - enableval=$enable_xselinux; XSELINUX=$enableval else - XSELINUX=no -fi -# Check whether --enable-xcsecurity was given. -if test "${enable_xcsecurity+set}" = set; then - enableval=$enable_xcsecurity; XCSECURITY=$enableval -else - XCSECURITY=no -fi +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF -# Check whether --enable-xcalibrate was given. -if test "${enable_xcalibrate+set}" = set; then - enableval=$enable_xcalibrate; XCALIBRATE=$enableval -else - XCALIBRATE=no fi -# Check whether --enable-tslib was given. -if test "${enable_tslib+set}" = set; then - enableval=$enable_tslib; TSLIB=$enableval -else - TSLIB=no -fi -# Check whether --enable-multibuffer was given. -if test "${enable_multibuffer+set}" = set; then - enableval=$enable_multibuffer; MULTIBUFFER=$enableval -else - MULTIBUFFER=no -fi +# Checks for headers/macros for byte swapping +# Known variants: +# bswap_16, bswap_32, bswap_64 (glibc) +# __swap16, __swap32, __swap64 (OpenBSD) +# bswap16, bswap32, bswap64 (other BSD's) +# and a fallback to local macros if none of the above are found -# Check whether --enable-dbe was given. -if test "${enable_dbe+set}" = set; then - enableval=$enable_dbe; DBE=$enableval -else - DBE=yes -fi +# if is found, assume it's the correct version +for ac_header in byteswap.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BYTESWAP_H 1 +_ACEOF -# Check whether --enable-xf86bigfont was given. -if test "${enable_xf86bigfont+set}" = set; then - enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval -else - XF86BIGFONT=no fi -# Check whether --enable-dpms was given. -if test "${enable_dpms+set}" = set; then - enableval=$enable_dpms; DPMSExtension=$enableval -else - DPMSExtension=yes -fi +done -# Check whether --enable-config-dbus was given. -if test "${enable_config_dbus+set}" = set; then - enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval -else - CONFIG_DBUS_API=no -fi -# Check whether --enable-config-hal was given. -if test "${enable_config_hal+set}" = set; then - enableval=$enable_config_hal; CONFIG_HAL=$enableval +# if is found, have to check which version +ac_fn_c_check_header_mongrel "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_endian_h" = x""yes; then : + HAVE_SYS_ENDIAN_H="yes" else - CONFIG_HAL=auto + HAVE_SYS_ENDIAN_H="no" fi -# Check whether --enable-xfree86-utils was given. -if test "${enable_xfree86_utils+set}" = set; then - enableval=$enable_xfree86_utils; XF86UTILS=$enableval -else - XF86UTILS=yes -fi -# Check whether --enable-xaa was given. -if test "${enable_xaa+set}" = set; then - enableval=$enable_xaa; XAA=$enableval -else - XAA=yes -fi -# Check whether --enable-vgahw was given. -if test "${enable_vgahw+set}" = set; then - enableval=$enable_vgahw; VGAHW=$enableval -else - VGAHW=yes -fi +if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of byteswapping macros" >&5 +$as_echo_n "checking for __swap16 variant of byteswapping macros... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --enable-vbe was given. -if test "${enable_vbe+set}" = set; then - enableval=$enable_vbe; VBE=$enableval -else - VBE=yes -fi +#include +#include -# Check whether --enable-int10-module was given. -if test "${enable_int10_module+set}" = set; then - enableval=$enable_int10_module; INT10MODULE=$enableval -else - INT10MODULE=yes -fi +int +main () +{ +int a = 1, b; +b = __swap16(a); -# Check whether --enable-xorg was given. -if test "${enable_xorg+set}" = set; then - enableval=$enable_xorg; XORG=$enableval -else - XORG=auto -fi + ; + return 0; +} -# Check whether --enable-dmx was given. -if test "${enable_dmx+set}" = set; then - enableval=$enable_dmx; DMX=$enableval +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + SYS_ENDIAN__SWAP='yes' else - DMX=auto + SYS_ENDIAN__SWAP='no' fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN__SWAP" >&5 +$as_echo "$SYS_ENDIAN__SWAP" >&6; } -# Check whether --enable-xvfb was given. -if test "${enable_xvfb+set}" = set; then - enableval=$enable_xvfb; XVFB=$enableval -else - XVFB=yes -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of byteswapping macros" >&5 +$as_echo_n "checking for bswap16 variant of byteswapping macros... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --enable-xnest was given. -if test "${enable_xnest+set}" = set; then - enableval=$enable_xnest; XNEST=$enableval -else - XNEST=auto -fi +#include +#include -# Check whether --enable-xquartz was given. -if test "${enable_xquartz+set}" = set; then - enableval=$enable_xquartz; XQUARTZ=$enableval -else - XQUARTZ=auto -fi +int +main () +{ -# Check whether --enable-standalone-xpbproxy was given. -if test "${enable_standalone_xpbproxy+set}" = set; then - enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval -else - STANDALONE_XPBPROXY=no -fi +int a = 1, b; +b = bswap16(a); -# Check whether --enable-xwin was given. -if test "${enable_xwin+set}" = set; then - enableval=$enable_xwin; XWIN=$enableval -else - XWIN=auto -fi + ; + return 0; +} -# Check whether --enable-kdrive was given. -if test "${enable_kdrive+set}" = set; then - enableval=$enable_kdrive; KDRIVE=$enableval +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + SYS_ENDIAN_BSWAP='yes' else - KDRIVE=no + SYS_ENDIAN_BSWAP='no' fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN_BSWAP" >&5 +$as_echo "$SYS_ENDIAN_BSWAP" >&6; } -# Check whether --enable-xephyr was given. -if test "${enable_xephyr+set}" = set; then - enableval=$enable_xephyr; XEPHYR=$enableval -else - XEPHYR=auto -fi + if test "$SYS_ENDIAN_BSWAP" = "yes" ; then + USE_SYS_ENDIAN_H=yes + BSWAP=bswap + else + if test "$SYS_ENDIAN__SWAP" = "yes" ; then + USE_SYS_ENDIAN_H=yes + BSWAP=__swap + else + USE_SYS_ENDIAN_H=no + fi + fi -# Check whether --enable-xsdl was given. -if test "${enable_xsdl+set}" = set; then - enableval=$enable_xsdl; XSDL=$enableval -else - XSDL=auto -fi + if test "$USE_SYS_ENDIAN_H" = "yes" ; then -# Check whether --enable-xfake was given. -if test "${enable_xfake+set}" = set; then - enableval=$enable_xfake; XFAKE=$enableval -else - XFAKE=auto -fi +$as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h -# Check whether --enable-xfbdev was given. -if test "${enable_xfbdev+set}" = set; then - enableval=$enable_xfbdev; XFBDEV=$enableval -else - XFBDEV=auto -fi +cat >>confdefs.h <<_ACEOF +#define bswap_16 ${BSWAP}16 +_ACEOF -# Check whether --enable-install-setuid was given. -if test "${enable_install_setuid+set}" = set; then - enableval=$enable_install_setuid; SETUID=$enableval -else - SETUID=auto -fi +cat >>confdefs.h <<_ACEOF +#define bswap_32 ${BSWAP}32 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define bswap_64 ${BSWAP}64 +_ACEOF -{ $as_echo "$as_me:$LINENO: checking to see if we can install the Xorg server as root" >&5 -$as_echo_n "checking to see if we can install the Xorg server as root... " >&6; } -if test "x$SETUID" = "xauto" ; then - case $host_os in - darwin*) SETUID="no" ;; - *) - case $host_cpu in - sparc) SETUID="no" ;; - *) SETUID="yes" ;; - esac - esac - if test "x$SETUID" = xyes; then - touch testfile - chown root testfile > /dev/null 2>&1 || SETUID="no" - rm -f testfile fi fi -{ $as_echo "$as_me:$LINENO: result: $SETUID" >&5 -$as_echo "$SETUID" >&6; } - if test "x$SETUID" = "xyes"; then - INSTALL_SETUID_TRUE= - INSTALL_SETUID_FALSE='#' + +ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : + else - INSTALL_SETUID_TRUE='#' - INSTALL_SETUID_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $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 dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + DLOPEN_LIBS="-ldl" fi +fi +for ac_func in vprintf +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VPRINTF 1 +_ACEOF -# Transport selection macro from xtrans.m4 +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = x""yes; then : +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h +fi - case $host_os in - mingw*) unixdef="no" ;; - *) unixdef="yes" ;; - esac - # Check whether --enable-unix-transport was given. -if test "${enable_unix_transport+set}" = set; then - enableval=$enable_unix_transport; UNIXCONN=$enableval -else - UNIXCONN=$unixdef fi +done - { $as_echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5 -$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } - if test "$UNIXCONN" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define UNIXCONN 1 +for ac_func in geteuid getuid link memmove memset mkstemp strchr strrchr \ + strtol getopt getopt_long vsnprintf walkcontext backtrace \ + getisax getzoneid shmctl64 strcasestr ffs +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 - { $as_echo "$as_me:$LINENO: result: $UNIXCONN" >&5 -$as_echo "$UNIXCONN" >&6; } - # Check whether --enable-tcp-transport was given. -if test "${enable_tcp_transport+set}" = set; then - enableval=$enable_tcp_transport; TCPCONN=$enableval +fi +done + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if test "${ac_cv_working_alloca_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_working_alloca_h=yes else - TCPCONN=yes + ac_cv_working_alloca_h=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_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then - { $as_echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5 -$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } - { $as_echo "$as_me:$LINENO: result: $TCPCONN" >&5 -$as_echo "$TCPCONN" >&6; } - if test "$TCPCONN" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define TCPCONN 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h +fi - # SVR4 hides these in libraries other than libc - { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5 -$as_echo_n "checking for library containing socket... " >&6; } -if test "${ac_cv_search_socket+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if test "${ac_cv_func_alloca_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - 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 __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# ifdef HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif #endif -char socket (); + int main () { -return socket (); +char *p = (char *) alloca (1); + if (p) return 0; ; return 0; } _ACEOF -for ac_lib in '' socket; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval 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_search_socket=$ac_res +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_func_alloca_works=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_alloca_works=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_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } +if test $ac_cv_func_alloca_works = yes; then -fi +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_socket+set}" = set; then - break -fi -done -if test "${ac_cv_search_socket+set}" = set; then - : else - ac_cv_search_socket=no + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext + +$as_echo "#define C_ALLOCA 1" >>confdefs.h + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 +$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } +if test "${ac_cv_os_cray+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 +webecray +#else +wenotbecray +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "webecray" >/dev/null 2>&1; then : + ac_cv_os_cray=yes +else + ac_cv_os_cray=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +rm -f conftest* + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 -$as_echo "$ac_cv_search_socket" >&6; } -ac_res=$ac_cv_search_socket -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func +_ACEOF + break fi - { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 -$as_echo_n "checking for library containing gethostbyname... " >&6; } -if test "${ac_cv_search_gethostbyname+set}" = set; then + done +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } +if test "${ac_cv_c_stack_direction+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then : + ac_cv_c_stack_direction=0 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +$ac_includes_default +int +find_stack_direction () +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -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 gethostbyname (); int main () { -return gethostbyname (); - ; - return 0; + return find_stack_direction () < 0; } _ACEOF -for ac_lib in '' nsl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval 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_search_gethostbyname=$ac_res +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_stack_direction=1 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_c_stack_direction=-1 +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_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF +#define STACK_DIRECTION $ac_cv_c_stack_direction +_ACEOF fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostbyname+set}" = set; then - break +ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize" +if test "x$ac_cv_func_getdtablesize" = x""yes; then : + +$as_echo "#define HAS_GETDTABLESIZE 1" >>confdefs.h + fi -done -if test "${ac_cv_search_gethostbyname+set}" = set; then - : -else - ac_cv_search_gethostbyname=no + +ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" +if test "x$ac_cv_func_getifaddrs" = x""yes; then : + +$as_echo "#define HAS_GETIFADDRS 1" >>confdefs.h + fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + +ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid" +if test "x$ac_cv_func_getpeereid" = x""yes; then : + +$as_echo "#define HAS_GETPEEREID 1" >>confdefs.h + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 -$as_echo "$ac_cv_search_gethostbyname" >&6; } -ac_res=$ac_cv_search_gethostbyname -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +ac_fn_c_check_func "$LINENO" "getpeerucred" "ac_cv_func_getpeerucred" +if test "x$ac_cv_func_getpeerucred" = x""yes; then : + +$as_echo "#define HAS_GETPEERUCRED 1" >>confdefs.h fi +ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" +if test "x$ac_cv_func_strlcat" = x""yes; then : + HAVE_STRLCAT=yes +else + HAVE_STRLCAT=no +fi -{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 -$as_echo_n "checking for main in -lws2_32... " >&6; } -if test "${ac_cv_lib_ws2_32_main+set}" = set; then - $as_echo_n "(cached) " >&6 + if test x$HAVE_STRLCAT = xno; then + NEED_STRLCAT_TRUE= + NEED_STRLCAT_FALSE='#' else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lws2_32 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + NEED_STRLCAT_TRUE='#' + NEED_STRLCAT_FALSE= +fi +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = x""yes; then : -int -main () -{ -return main (); - ; - 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_ws2_32_main=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define HAS_STRLCPY 1" >>confdefs.h - ac_cv_lib_ws2_32_main=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 + + if test x$HAVE_VSNPRINTF = xno; then + NEED_VSNPRINTF_TRUE= + NEED_VSNPRINTF_FALSE='#' +else + NEED_VSNPRINTF_TRUE='#' + NEED_VSNPRINTF_FALSE= fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5 -$as_echo "$ac_cv_lib_ws2_32_main" >&6; } -if test "x$ac_cv_lib_ws2_32_main" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBWS2_32 1 -_ACEOF - LIBS="-lws2_32 $LIBS" + +ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = x""yes; then : + +$as_echo "#define HAS_MMAP 1" >>confdefs.h fi -ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main - # Needs to come after above checks for libsocket & libnsl for SVR4 systems - # Check whether --enable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then - enableval=$enable_ipv6; IPV6CONN=$enableval -else - { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5 -$as_echo_n "checking for getaddrinfo... " >&6; } -if test "${ac_cv_func_getaddrinfo+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +$as_echo_n "checking for sqrt in -lm... " >&6; } +if test "${ac_cv_lib_m_sqrt+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="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define getaddrinfo to an innocuous variant, in case declares getaddrinfo. - For example, HP-UX 11i declares gettimeofday. */ -#define getaddrinfo innocuous_getaddrinfo - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getaddrinfo (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getaddrinfo /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -20466,463 +14458,329 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char getaddrinfo (); -/* 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_getaddrinfo || defined __stub___getaddrinfo -choke me -#endif - +char sqrt (); int main () { -return getaddrinfo (); +return sqrt (); ; 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_getaddrinfo=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_getaddrinfo=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_getaddrinfo" >&5 -$as_echo "$ac_cv_func_getaddrinfo" >&6; } -if test "x$ac_cv_func_getaddrinfo" = x""yes; then - IPV6CONN=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sqrt=yes else - IPV6CONN=no + ac_cv_lib_m_sqrt=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: checking if IPv6 support should be built" >&5 -$as_echo_n "checking if IPv6 support should be built... " >&6; } - if test "$IPV6CONN" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define IPv6 1 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +$as_echo "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 _ACEOF - fi - { $as_echo "$as_me:$LINENO: result: $IPV6CONN" >&5 -$as_echo "$IPV6CONN" >&6; } + LIBS="-lm $LIBS" - # 4.3BSD-Reno added a new member to struct sockaddr_in - { $as_echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5 -$as_echo_n "checking for struct sockaddr_in.sin_len... " >&6; } -if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cbrt in -lm" >&5 +$as_echo_n "checking for cbrt in -lm... " >&6; } +if test "${ac_cv_lib_m_cbrt+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="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include - - +/* 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 cbrt (); int main () { -static struct sockaddr_in ac_aggr; -if (ac_aggr.sin_len) -return 0; +return cbrt (); ; 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_cv_member_struct_sockaddr_in_sin_len=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cbrt=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_m_cbrt=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_m_cbrt" >&5 +$as_echo "$ac_cv_lib_m_cbrt" >&6; } +if test "x$ac_cv_lib_m_cbrt" = x""yes; then : - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +$as_echo "#define HAVE_CBRT 1" >>confdefs.h -#include -#include -#include +fi -int -main () -{ -static struct sockaddr_in ac_aggr; -if (sizeof ac_aggr.sin_len) -return 0; - ; - return 0; -} +for ac_header in ndbm.h dbm.h rpcsvc/dbm.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 -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_cv_member_struct_sockaddr_in_sin_len=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct_sockaddr_in_sin_len=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5 -$as_echo "$ac_cv_member_struct_sockaddr_in_sin_len" >&6; } -if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define BSD44SOCKETS 1 +for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.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 - + AGP=yes fi +done - # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. - { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5 -$as_echo_n "checking for socklen_t... " >&6; } -if test "${ac_cv_type_socklen_t+set}" = set; then - $as_echo_n "(cached) " >&6 + if test "x$AGP" = xyes; then + AGP_TRUE= + AGP_FALSE='#' else - ac_cv_type_socklen_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + AGP_TRUE='#' + AGP_FALSE= +fi -$ac_includes_default -#include -int -main () -{ -if (sizeof (socklen_t)) - 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +for ac_header in linux/apm_bios.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "linux/apm_bios.h" "ac_cv_header_linux_apm_bios_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_apm_bios_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LINUX_APM_BIOS_H 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + LNXAPM=yes +fi -$ac_includes_default -#include +done -int -main () -{ -if (sizeof ((socklen_t))) - 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 - : + if test "x$LNXAPM" = xyes; then + LNXAPM_TRUE= + LNXAPM_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LNXAPM_TRUE='#' + LNXAPM_FALSE= +fi - ac_cv_type_socklen_t=yes + +for ac_header in linux/fb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_fb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LINUX_FB_H 1 +_ACEOF + FBDEV=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done + + if test "x$FBDEV" = xyes; then + FBDEVHW_TRUE= + FBDEVHW_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + FBDEVHW_TRUE='#' + FBDEVHW_FALSE= +fi +for ac_header in asm/mtrr.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "asm/mtrr.h" "ac_cv_header_asm_mtrr_h" "$ac_includes_default" +if test "x$ac_cv_header_asm_mtrr_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ASM_MTRR_H 1 +_ACEOF + ac_cv_asm_mtrr_h=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done + +if test "x$ac_cv_asm_mtrr_h" = xyes; then + HAVE_MTRR=yes fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 -$as_echo "$ac_cv_type_socklen_t" >&6; } -if test "x$ac_cv_type_socklen_t" = x""yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_SOCKLEN_T 1 +for ac_header in sys/memrange.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/memrange.h" "ac_cv_header_sys_memrange_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_memrange_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_MEMRANGE_H 1 _ACEOF + ac_cv_memrange_h=yes +fi +done +if test "x$ac_cv_memrange_h" = xyes; then + HAVE_MTRR=yes fi +if test "x$HAVE_MTRR" = xyes; then +$as_echo "#define HAS_MTRR_SUPPORT 1" >>confdefs.h - fi - case $host_os in - solaris*|sco*|sysv4*) localdef="yes" ;; - *) localdef="no" ;; - esac - # Check whether --enable-local-transport was given. -if test "${enable_local_transport+set}" = set; then - enableval=$enable_local_transport; LOCALCONN=$enableval -else - LOCALCONN=$localdef fi - { $as_echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5 -$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } - { $as_echo "$as_me:$LINENO: result: $LOCALCONN" >&5 -$as_echo "$LOCALCONN" >&6; } - if test "$LOCALCONN" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define LOCALCONN 1 +for ac_header in machine/mtrr.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "machine/mtrr.h" "ac_cv_header_machine_mtrr_h" "$ac_includes_default" +if test "x$ac_cv_header_machine_mtrr_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MACHINE_MTRR_H 1 _ACEOF + ac_cv_machine_mtrr_h=yes +fi - fi +done +if test "x$ac_cv_machine_mtrr_h" = xyes; then +$as_echo "#define HAS_MTRR_BUILTIN 1" >>confdefs.h -# Secure RPC detection macro from xtrans.m4 +fi - # Check whether --enable-secure-rpc was given. -if test "${enable_secure_rpc+set}" = set; then - enableval=$enable_secure_rpc; SECURE_RPC=$enableval +for ac_header in sys/linker.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/linker.h" "ac_cv_header_sys_linker_h" "#include +" +if test "x$ac_cv_header_sys_linker_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_LINKER_H 1 +_ACEOF + ac_cv_sys_linker_h=yes else - SECURE_RPC="try" + ac_cv_sys_linker_h=no fi +done - if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then - FOUND_SECURE_RPC="no" + if test "x$ac_cv_sys_linker_h" = xyes; then + FREEBSD_KLDLOAD_TRUE= + FREEBSD_KLDLOAD_FALSE='#' +else + FREEBSD_KLDLOAD_TRUE='#' + FREEBSD_KLDLOAD_FALSE= +fi -for ac_func in authdes_seccreate authdes_create -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:${as_lineno-$LINENO}: checking for SYSV IPC" >&5 +$as_echo_n "checking for SYSV IPC... " >&6; } +if test "${ac_cv_sysv_ipc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +#include +#include +#include int main () { -return $ac_func (); + +{ + int id; + id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); + if (id < 0) return -1; + return shmctl(id, IPC_RMID, 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_link "$LINENO"; then : + ac_cv_sysv_ipc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_sysv_ipc=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_sysv_ipc" >&5 +$as_echo "$ac_cv_sysv_ipc" >&6; } +if test "x$ac_cv_sysv_ipc" = xyes; then + +$as_echo "#define HAVE_SYSV_IPC 1" >>confdefs.h - 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 +if test -c /dev/xf86 ; then + +$as_echo "#define HAS_APERTURE_DRV 1" >>confdefs.h + 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 - FOUND_SECURE_RPC="yes" + +ac_fn_c_check_header_mongrel "$LINENO" "machine/apmvar.h" "ac_cv_header_machine_apmvar_h" "$ac_includes_default" +if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then : + + ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_event_h" = x""yes; then : + ac_cv_BSD_KQUEUE_APM=yes +else + ac_cv_BSD_APM=yes fi -done - if test "x$FOUND_SECURE_RPC" = "xno" ; then - if test "x$SECURE_RPC" = "xyes" ; then - { { $as_echo "$as_me:$LINENO: error: Secure RPC requested, but required functions not found" >&5 -$as_echo "$as_me: error: Secure RPC requested, but required functions not found" >&2;} - { (exit 1); exit 1; }; } - fi - SECURE_RPC="no" - else - { $as_echo "$as_me:$LINENO: checking for library containing getsecretkey" >&5 -$as_echo_n "checking for library containing getsecretkey... " >&6; } -if test "${ac_cv_search_getsecretkey+set}" = set; then + +fi + + + + if test "x$ac_cv_BSD_APM" = xyes; then + BSD_APM_TRUE= + BSD_APM_FALSE='#' +else + BSD_APM_TRUE='#' + BSD_APM_FALSE= +fi + + if test "x$ac_cv_BSD_KQUEUE_APM" = xyes; then + BSD_KQUEUE_APM_TRUE= + BSD_KQUEUE_APM_FALSE='#' +else + BSD_KQUEUE_APM_TRUE='#' + BSD_KQUEUE_APM_FALSE= +fi + + +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 : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5 +$as_echo_n "checking for backtrace in -lc... " >&6; } +if test "${ac_cv_lib_c_backtrace+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20931,1884 +14789,1625 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char getsecretkey (); +char backtrace (); int main () { -return getsecretkey (); +return backtrace (); ; return 0; } _ACEOF -for ac_lib in '' rpcsvc; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval 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_search_getsecretkey=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_getsecretkey+set}" = set; then - break -fi -done -if test "${ac_cv_search_getsecretkey+set}" = set; then - : +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_backtrace=yes else - ac_cv_search_getsecretkey=no + ac_cv_lib_c_backtrace=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +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_search_getsecretkey" >&5 -$as_echo "$ac_cv_search_getsecretkey" >&6; } -ac_res=$ac_cv_search_getsecretkey -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 +$as_echo "$ac_cv_lib_c_backtrace" >&6; } +if test "x$ac_cv_lib_c_backtrace" = x""yes; then : -fi - SECURE_RPC="yes" - fi - fi - { $as_echo "$as_me:$LINENO: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 -$as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } - if test "x$SECURE_RPC" = "xyes" ; then +$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define SECURE_RPC 1 -_ACEOF - fi - { $as_echo "$as_me:$LINENO: result: $SECURE_RPC" >&5 -$as_echo "$SECURE_RPC" >&6; } +$as_echo "#define HAVE_EXECINFO_H 1" >>confdefs.h + - if test "x$SECURE_RPC" = xyes; then - SECURE_RPC_TRUE= - SECURE_RPC_FALSE='#' -else - SECURE_RPC_TRUE='#' - SECURE_RPC_FALSE= fi - if test "x$INT10" = xvm86; then - INT10_VM86_TRUE= - INT10_VM86_FALSE='#' -else - INT10_VM86_TRUE='#' - INT10_VM86_FALSE= fi - if test "x$INT10" = xx86emu; then - INT10_X86EMU_TRUE= - INT10_X86EMU_FALSE='#' -else - INT10_X86EMU_TRUE='#' - INT10_X86EMU_FALSE= -fi - if test "x$INT10" = xstub; then - INT10_STUB_TRUE= - INT10_STUB_FALSE='#' -else - INT10_STUB_TRUE='#' - INT10_STUB_FALSE= -fi -if test "x$INT10" = xyes; then +DEFAULT_INT10="x86emu" -for ac_header in sys/vm86.h sys/io.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +case $host_cpu in + alpha*) + ALPHA_VIDEO=yes + case $host_os in + *freebsd*) SYS_LIBS=-lio ;; + *netbsd*) +$as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h + ;; + esac + GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" + ;; + arm*) + ARM_VIDEO=yes + ;; + i*86) + I386_VIDEO=yes + case $host_os in + *freebsd*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h + ;; + *dragonfly*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h + ;; + *netbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h - ac_header_compiler=no -fi + SYS_LIBS=-li386 + ;; + *openbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h + + SYS_LIBS=-li386 + ;; + esac + ;; + powerpc*) + PPC_VIDEO=yes + case $host_os in + *freebsd*) DEFAULT_INT10=stub ;; + esac + ;; + sparc*) + SPARC64_VIDEO=yes + BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + x86_64*|amd64*) + I386_VIDEO=yes + case $host_os in + *freebsd*) +$as_echo "#define USE_DEV_IO 1" >>confdefs.h + ;; + *dragonfly*) +$as_echo "#define USE_DEV_IO 1" >>confdefs.h + ;; + *netbsd*) +$as_echo "#define USE_I386_IOPL 1" >>confdefs.h -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; } + SYS_LIBS=-lx86_64 + ;; + *openbsd*) +$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h -# 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;; + SYS_LIBS=-lamd64 + ;; + esac + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + ia64*) + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + s390*) + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 + if test "x$ALPHA_VIDEO" = xyes; then + ALPHA_VIDEO_TRUE= + ALPHA_VIDEO_FALSE='#' else - eval "$as_ac_Header=\$ac_header_preproc" + ALPHA_VIDEO_TRUE='#' + ALPHA_VIDEO_FALSE= 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; } + if test "x$ARM_VIDEO" = xyes; then + ARM_VIDEO_TRUE= + ARM_VIDEO_FALSE='#' +else + ARM_VIDEO_TRUE='#' + ARM_VIDEO_FALSE= 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 + if test "x$I386_VIDEO" = xyes; then + I386_VIDEO_TRUE= + I386_VIDEO_FALSE='#' +else + I386_VIDEO_TRUE='#' + I386_VIDEO_FALSE= fi -done - + if test "x$PPC_VIDEO" = xyes; then + PPC_VIDEO_TRUE= + PPC_VIDEO_FALSE='#' +else + PPC_VIDEO_TRUE='#' + PPC_VIDEO_FALSE= fi - if test "x$BUILDDOCS" = xyes; then - BUILDDOCS_TRUE= - BUILDDOCS_FALSE='#' + if test "x$SPARC64_VIDEO" = xyes; then + SPARC64_VIDEO_TRUE= + SPARC64_VIDEO_FALSE='#' else - BUILDDOCS_TRUE='#' - BUILDDOCS_FALSE= + SPARC64_VIDEO_TRUE='#' + SPARC64_VIDEO_FALSE= fi +DRI=no +USE_SIGIO_BY_DEFAULT="yes" +case $host_os in + *freebsd* | *dragonfly*) + case $host_os in + kfreebsd*-gnu) ;; + *) +$as_echo "#define CSRG_BASED 1" >>confdefs.h + ;; + esac -if test x$XORG_SGML_PATH = x ; then - XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h -if test x"$cross_compiling" = x"yes" ; then - HAVE_DEFS_ENT=no -else - as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5 -$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "$XORG_SGML_PATH/X11/defs.ent"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $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_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - HAVE_DEFS_ENT=yes -fi -fi +$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h -# Extract the first word of "linuxdoc", so it can be a program name with args. -set dummy linuxdoc; 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_LINUXDOC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $LINUXDOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_LINUXDOC="$LINUXDOC" # 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_LINUXDOC="$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 - ;; -esac -fi -LINUXDOC=$ac_cv_path_LINUXDOC -if test -n "$LINUXDOC"; then - { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5 -$as_echo "$LINUXDOC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +$as_echo "#define SYSCONS_SUPPORT 1" >>confdefs.h + DRI=yes + ;; + *netbsd*) -# Extract the first word of "ps2pdf", so it can be a program name with args. -set dummy ps2pdf; 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_PS2PDF+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PS2PDF in - [\\/]* | ?:[\\/]*) - ac_cv_path_PS2PDF="$PS2PDF" # 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_PS2PDF="$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 +$as_echo "#define CSRG_BASED 1" >>confdefs.h - ;; -esac -fi -PS2PDF=$ac_cv_path_PS2PDF -if test -n "$PS2PDF"; then - { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5 -$as_echo "$PS2PDF" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking Whether to build documentation" >&5 -$as_echo_n "checking Whether to build documentation... " >&6; } +$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h -if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then - BUILDDOC=yes -else - BUILDDOC=no -fi - if test x$BUILDDOC = xyes; then - BUILD_LINUXDOC_TRUE= - BUILD_LINUXDOC_FALSE='#' -else - BUILD_LINUXDOC_TRUE='#' - BUILD_LINUXDOC_FALSE= -fi +$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h + DRI=yes + ;; + *openbsd*) -{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5 -$as_echo "$BUILDDOC" >&6; } +$as_echo "#define CSRG_BASED 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5 -$as_echo_n "checking Whether to build pdf documentation... " >&6; } -if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then - BUILDPDFDOC=yes -else - BUILDPDFDOC=no -fi +$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h - if test x$BUILDPDFDOC = xyes; then - BUILD_PDFDOC_TRUE= - BUILD_PDFDOC_FALSE='#' -else - BUILD_PDFDOC_TRUE='#' - BUILD_PDFDOC_FALSE= -fi +$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5 -$as_echo "$BUILDPDFDOC" >&6; } + ;; + *linux*) + DRI=yes + ;; + *solaris*) + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + DRI=yes +else + DRI=no +fi + # Disable use of SIGIO by default until some system bugs are + # fixed - see Sun/OpenSolaris bug id 6879897 + USE_SIGIO_BY_DEFAULT="no" + ;; + darwin*) -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -MAKE_PDF="$PS2PDF" -MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" +$as_echo "#define CSRG_BASED 1" >>confdefs.h + ;; +esac +PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` +PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1` +if test "x$PVS" = "x"; then + PVS="0" +fi +VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)" +VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" +VENDOR_NAME="The X.Org Foundation" +VENDOR_NAME_SHORT="X.Org" +VENDOR_WEB="http://wiki.x.org" - if test "x$INSTALL_LIBXF86CONFIG" = xyes; then - INSTALL_LIBXF86CONFIG_TRUE= - INSTALL_LIBXF86CONFIG_FALSE='#' -else - INSTALL_LIBXF86CONFIG_TRUE='#' - INSTALL_LIBXF86CONFIG_FALSE= +# Check whether --enable-werror was given. +if test "${enable_werror+set}" = set; then : + enableval=$enable_werror; as_fn_error "--enable-werror has been replaced by --enable-strict-compilation" "$LINENO" 5 fi -case $host_os in - darwin*) - DRI2=no - - if test x$XQUARTZ = xauto; then - { $as_echo "$as_me:$LINENO: checking whether to build Xquartz" >&5 -$as_echo_n "checking whether to build Xquartz... " >&6; } -if test "${xorg_cv_Carbon_framework+set}" = set; then - $as_echo_n "(cached) " >&6 +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; DEBUGGING=$enableval else + DEBUGGING=no +fi - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -framework Carbon" - cat >conftest.$ac_ext <<_ACEOF -char FSFindFolder(); int main() { FSFindFolder(); 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 - xorg_cv_Carbon_framework=yes +# Check whether --enable-unit-tests was given. +if test "${enable_unit_tests+set}" = set; then : + enableval=$enable_unit_tests; UNITTESTS=$enableval else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - xorg_cv_Carbon_framework=no + UNITTESTS=auto fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS +# Check whether --enable-sigio-default was given. +if test "${enable_sigio_default+set}" = set; then : + enableval=$enable_sigio_default; USE_SIGIO_BY_DEFAULT=$enableval fi -{ $as_echo "$as_me:$LINENO: result: $xorg_cv_Carbon_framework" >&5 -$as_echo "$xorg_cv_Carbon_framework" >&6; } - if test "X$xorg_cv_Carbon_framework" = Xyes; then - XQUARTZ=yes - else - XQUARTZ=no - fi - fi - if test "x$XQUARTZ" = xyes ; then - XQUARTZ=yes - XVFB=no - XNEST=no +# Check whether --with-int10 was given. +if test "${with_int10+set}" = set; then : + withval=$with_int10; INT10="$withval" +else + INT10="$DEFAULT_INT10" +fi - COMPOSITE=no - DGA=no - DPMSExtension=no - XF86VIDMODE=no - fi - ;; - *) XQUARTZ=no ;; -esac -XEXT_INC='-I$(top_srcdir)/Xext' -XEXT_LIB='$(top_builddir)/Xext/libXext.la' -XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' +# Check whether --with-vendor-name was given. +if test "${with_vendor_name+set}" = set; then : + withval=$with_vendor_name; VENDOR_NAME="$withval" +fi -VIDEOPROTO="videoproto" -COMPOSITEPROTO="compositeproto >= 0.4" -RECORDPROTO="recordproto >= 1.13.99.1" -SCRNSAVERPROTO="scrnsaverproto >= 1.1" -RESOURCEPROTO="resourceproto" -DRIPROTO="xf86driproto >= 2.1.0" -DRI2PROTO="dri2proto >= 2.1" -XINERAMAPROTO="xineramaproto" -BIGFONTPROTO="xf86bigfontproto >= 1.2.0" -XCALIBRATEPROTO="xcalibrateproto" -DGAPROTO="xf86dgaproto >= 2.0.99.1" -GLPROTO="glproto >= 1.4.9" -DMXPROTO="dmxproto >= 2.2.99.1" -VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" -WINDOWSWMPROTO="windowswmproto" -APPLEWMPROTO="applewmproto >= 1.4" -REQUIRED_MODULES="randrproto >= 1.2.99.3 renderproto >= 0.11 fixesproto >= 4.1 damageproto >= 1.1 xcmiscproto >= 1.2.0 xextproto >= 7.0.99.3 xproto >= 7.0.13 xtrans >= 1.2.2 bigreqsproto >= 1.1.0 fontsproto inputproto >= 1.9.99.902 kbproto >= 1.0.3" -REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20" +# Check whether --with-vendor-name-short was given. +if test "${with_vendor_name_short+set}" = set; then : + withval=$with_vendor_name_short; VENDOR_NAME_SHORT="$withval" +fi -LIBAPPLEWM="applewm >= 1.4" -LIBDMX="dmx >= 1.0.99.1" -LIBDRI="dri >= 7.1.0" -LIBDRM="libdrm >= 2.3.0" -LIBGL="gl >= 7.1.0" -LIBXEXT="xext >= 1.0.99.4" -LIBXI="xi >= 1.2.99.1" -LIBXTST="xtst >= 1.0.99.2" -LIBPCIACCESS="pciaccess >= 0.8.0" -LIBGLIB="glib-2.0 >= 2.16" +# Check whether --with-vendor-web was given. +if test "${with_vendor_web+set}" = set; then : + withval=$with_vendor_web; VENDOR_WEB="$withval" +fi -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` +# Check whether --with-module-dir was given. +if test "${with_module_dir+set}" = set; then : + withval=$with_module_dir; moduledir="$withval" else - pkg_failed=yes -fi - else - pkg_failed=untried + moduledir="${libdir}/xorg/modules" fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` + + +# Check whether --with-log-dir was given. +if test "${with_log_dir+set}" = set; then : + withval=$with_log_dir; logdir="$withval" else - pkg_failed=yes -fi - else - pkg_failed=untried + logdir="$localstatedir/log" fi +# Check whether --with-builder-addr was given. +if test "${with_builder_addr+set}" = set; then : + withval=$with_builder_addr; BUILDERADDR="$withval" +else + BUILDERADDR="xorg@lists.freedesktop.org" +fi -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Check whether --with-os-name was given. +if test "${with_os_name+set}" = set; then : + withval=$with_os_name; OSNAME="$withval" else - _pkg_short_errors_supported=no + OSNAME=`uname -srm` fi - if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` - else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - HAVE_DBUS=no -elif test $pkg_failed = untried; then - HAVE_DBUS=no + +# Check whether --with-os-vendor was given. +if test "${with_os_vendor+set}" = set; then : + withval=$with_os_vendor; OSVENDOR="$withval" else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_DBUS=yes + OSVENDOR="" fi -if test "x$HAVE_DBUS" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_DBUS 1 -_ACEOF + +# Check whether --with-builderstring was given. +if test "${with_builderstring+set}" = set; then : + withval=$with_builderstring; BUILDERSTRING="$withval" fi - if test "x$HAVE_DBUS" = xyes; then - HAVE_DBUS_TRUE= - HAVE_DBUS_FALSE='#' + + +# Check whether --with-fontdir was given. +if test "${with_fontdir+set}" = set; then : + withval=$with_fontdir; FONTDIR="$withval" else - HAVE_DBUS_TRUE='#' - HAVE_DBUS_FALSE= + FONTDIR="${libdir}/X11/fonts" fi +DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" +case $host_os in + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; +esac -if test "x$CONFIG_DBUS_API" = xauto; then - CONFIG_DBUS_API="$HAVE_DBUS" +# Check whether --with-default-font-path was given. +if test "${with_default_font_path+set}" = set; then : + withval=$with_default_font_path; FONTPATH="$withval" +else + FONTPATH="${DEFAULT_FONT_PATH}" fi -if test "x$CONFIG_DBUS_API" = xyes; then - if ! test "x$HAVE_DBUS" = xyes; then - { { $as_echo "$as_me:$LINENO: error: D-Bus configuration API requested, but D-Bus is not installed." >&5 -$as_echo "$as_me: error: D-Bus configuration API requested, but D-Bus is not installed." >&2;} - { (exit 1); exit 1; }; } - fi -cat >>confdefs.h <<\_ACEOF -#define CONFIG_DBUS_API 1 -_ACEOF - CONFIG_NEED_DBUS="yes" -fi - if test "x$CONFIG_DBUS_API" = xyes; then - CONFIG_DBUS_API_TRUE= - CONFIG_DBUS_API_FALSE='#' +# Check whether --with-xkb-path was given. +if test "${with_xkb_path+set}" = set; then : + withval=$with_xkb_path; XKBPATH="$withval" else - CONFIG_DBUS_API_TRUE='#' - CONFIG_DBUS_API_FALSE= + XKBPATH="${datadir}/X11/xkb" fi +# Check whether --with-xkb-output was given. +if test "${with_xkb_output+set}" = set; then : + withval=$with_xkb_output; XKBOUTPUT="$withval" +else + XKBOUTPUT="compiled" +fi -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for HAL" >&5 -$as_echo_n "checking for HAL... " >&6; } -if test -n "$HAL_CFLAGS"; then - pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 - ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` +# Check whether --with-default-xkb-rules was given. +if test "${with_default_xkb_rules+set}" = set; then : + withval=$with_default_xkb_rules; XKB_DFLT_RULES="$withval" else - pkg_failed=yes -fi - else - pkg_failed=untried + XKB_DFLT_RULES="" fi -if test -n "$HAL_LIBS"; then - pkg_cv_HAL_LIBS="$HAL_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 - ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` + + +# Check whether --with-default-xkb-model was given. +if test "${with_default_xkb_model+set}" = set; then : + withval=$with_default_xkb_model; XKB_DFLT_MODEL="$withval" else - pkg_failed=yes -fi - else - pkg_failed=untried + XKB_DFLT_MODEL="pc104" fi +# Check whether --with-default-xkb-layout was given. +if test "${with_default_xkb_layout+set}" = set; then : + withval=$with_default_xkb_layout; XKB_DFLT_LAYOUT="$withval" +else + XKB_DFLT_LAYOUT="us" +fi -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Check whether --with-default-xkb-variant was given. +if test "${with_default_xkb_variant+set}" = set; then : + withval=$with_default_xkb_variant; XKB_DFLT_VARIANT="$withval" else - _pkg_short_errors_supported=no + XKB_DFLT_VARIANT="" fi - if test $_pkg_short_errors_supported = yes; then - HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1` - else - HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$HAL_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - HAVE_HAL=no -elif test $pkg_failed = untried; then - HAVE_HAL=no + +# Check whether --with-default-xkb-options was given. +if test "${with_default_xkb_options+set}" = set; then : + withval=$with_default_xkb_options; XKB_DFLT_OPTIONS="$withval" else - HAL_CFLAGS=$pkg_cv_HAL_CFLAGS - HAL_LIBS=$pkg_cv_HAL_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_HAL=yes + XKB_DFLT_OPTIONS="" +fi + + +# Check whether --with-serverconfig-path was given. +if test "${with_serverconfig_path+set}" = set; then : + withval=$with_serverconfig_path; SERVERCONFIG="$withval" +else + SERVERCONFIG="${libdir}/xorg" fi -if test "x$CONFIG_HAL" = xauto; then - CONFIG_HAL="$HAVE_HAL" + + +# Check whether --with-apple-applications-dir was given. +if test "${with_apple_applications_dir+set}" = set; then : + withval=$with_apple_applications_dir; APPLE_APPLICATIONS_DIR="${withval}" +else + APPLE_APPLICATIONS_DIR="/Applications/Utilities" fi -if test "x$CONFIG_HAL" = xyes; then - if ! test "x$HAVE_HAL" = xyes; then - { { $as_echo "$as_me:$LINENO: error: HAL hotplug API requested, but HAL is not installed." >&5 -$as_echo "$as_me: error: HAL hotplug API requested, but HAL is not installed." >&2;} - { (exit 1); exit 1; }; } - fi -cat >>confdefs.h <<\_ACEOF -#define CONFIG_HAL 1 -_ACEOF - REQUIRED_LIBS="$REQUIRED_LIBS hal" - CONFIG_NEED_DBUS="yes" +# Check whether --with-apple-application-name was given. +if test "${with_apple_application_name+set}" = set; then : + withval=$with_apple_application_name; APPLE_APPLICATION_NAME="${withval}" +else + APPLE_APPLICATION_NAME="X11" fi - if test "x$CONFIG_HAL" = xyes; then - CONFIG_HAL_TRUE= - CONFIG_HAL_FALSE='#' + + + +# Check whether --with-launchd-id-prefix was given. +if test "${with_launchd_id_prefix+set}" = set; then : + withval=$with_launchd_id_prefix; LAUNCHD_ID_PREFIX="${withval}" else - CONFIG_HAL_TRUE='#' - CONFIG_HAL_FALSE= + LAUNCHD_ID_PREFIX="org.x" fi -if test "x$CONFIG_NEED_DBUS" = xyes; then - REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" -cat >>confdefs.h <<\_ACEOF -#define CONFIG_NEED_DBUS 1 +cat >>confdefs.h <<_ACEOF +#define LAUNCHD_ID_PREFIX "$LAUNCHD_ID_PREFIX" _ACEOF +# Check whether --enable-sparkle was given. +if test "${enable_sparkle+set}" = set; then : + enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" +else + XQUARTZ_SPARKLE="no" fi - if test "x$CONFIG_NEED_DBUS" = xyes; then - CONFIG_NEED_DBUS_TRUE= - CONFIG_NEED_DBUS_FALSE='#' + + +# Check whether --enable-builddocs was given. +if test "${enable_builddocs+set}" = set; then : + enableval=$enable_builddocs; BUILDDOCS=$enableval else - CONFIG_NEED_DBUS_TRUE='#' - CONFIG_NEED_DBUS_FALSE= + BUILDDOCS=no fi -CONFIG_LIB='$(top_builddir)/config/libconfig.la' +# Check whether --enable-install-libxf86config was given. +if test "${enable_install_libxf86config+set}" = set; then : + enableval=$enable_install_libxf86config; INSTALL_LIBXF86CONFIG=$enableval +else + INSTALL_LIBXF86CONFIG=no +fi -if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then - USE_SIGIO_BY_DEFAULT_VALUE=TRUE +# Check whether --enable-null-root-cursor was given. +if test "${enable_null_root_cursor+set}" = set; then : + enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval else - USE_SIGIO_BY_DEFAULT_VALUE=FALSE + NULL_ROOT_CURSOR=no fi -cat >>confdefs.h <<_ACEOF -#define USE_SIGIO_BY_DEFAULT $USE_SIGIO_BY_DEFAULT_VALUE -_ACEOF +# Check whether --enable-visibility was given. +if test "${enable_visibility+set}" = set; then : + enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval +else + SYMBOL_VISIBILITY=auto +fi -{ $as_echo "$as_me:$LINENO: checking for glibc..." >&5 -$as_echo_n "checking for glibc...... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -#include -#ifndef __GLIBC__ -#error -#endif +# Check whether --with-dri-driver-path was given. +if test "${with_dri_driver_path+set}" = set; then : + withval=$with_dri_driver_path; DRI_DRIVER_PATH="$withval" +else + DRI_DRIVER_PATH="${libdir}/dri" +fi -_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 - glibc=yes +# Check whether --enable-aiglx was given. +if test "${enable_aiglx+set}" = set; then : + enableval=$enable_aiglx; AIGLX=$enableval else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + AIGLX=yes +fi - glibc=no +# Check whether --enable-glx-tls was given. +if test "${enable_glx_tls+set}" = set; then : + enableval=$enable_glx_tls; GLX_USE_TLS=$enableval +else + GLX_USE_TLS=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $glibc" >&5 -$as_echo "$glibc" >&6; } +# Check whether --enable-registry was given. +if test "${enable_registry+set}" = set; then : + enableval=$enable_registry; XREGISTRY=$enableval +else + XREGISTRY=yes +fi -for ac_func in clock_gettime -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 +# Check whether --enable-composite was given. +if test "${enable_composite+set}" = set; then : + enableval=$enable_composite; COMPOSITE=$enableval else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + COMPOSITE=yes +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Check whether --enable-mitshm was given. +if test "${enable_mitshm+set}" = set; then : + enableval=$enable_mitshm; MITSHM=$enableval +else + MITSHM=yes +fi -#ifdef __STDC__ -# include -#else -# include -#endif +# Check whether --enable-xres was given. +if test "${enable_xres+set}" = set; then : + enableval=$enable_xres; RES=$enableval +else + RES=yes +fi -#undef $ac_func +# Check whether --enable-record was given. +if test "${enable_record+set}" = set; then : + enableval=$enable_record; RECORD=$enableval +else + RECORD=no +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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +# Check whether --enable-xv was given. +if test "${enable_xv+set}" = set; then : + enableval=$enable_xv; XV=$enableval +else + XV=yes +fi -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +# Check whether --enable-xvmc was given. +if test "${enable_xvmc+set}" = set; then : + enableval=$enable_xvmc; XVMC=$enableval else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + XVMC=yes +fi - eval "$as_ac_var=no" +# Check whether --enable-dga was given. +if test "${enable_dga+set}" = set; then : + enableval=$enable_dga; DGA=$enableval +else + DGA=auto fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +# Check whether --enable-screensaver was given. +if test "${enable_screensaver+set}" = set; then : + enableval=$enable_screensaver; SCREENSAVER=$enableval +else + SCREENSAVER=yes 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 - have_clock_gettime=yes + +# Check whether --enable-xdmcp was given. +if test "${enable_xdmcp+set}" = set; then : + enableval=$enable_xdmcp; XDMCP=$enableval else - { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 -$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then - $as_echo_n "(cached) " >&6 + XDMCP=auto +fi + +# Check whether --enable-xdm-auth-1 was given. +if test "${enable_xdm_auth_1+set}" = set; then : + enableval=$enable_xdm_auth_1; XDMAUTH=$enableval else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + XDMAUTH=auto +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 clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - 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_rt_clock_gettime=yes +# Check whether --enable-glx was given. +if test "${enable_glx+set}" = set; then : + enableval=$enable_glx; GLX=$enableval else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + GLX=yes +fi + +# Check whether --enable-dri was given. +if test "${enable_dri+set}" = set; then : + enableval=$enable_dri; DRI=$enableval +fi + +# Check whether --enable-dri2 was given. +if test "${enable_dri2+set}" = set; then : + enableval=$enable_dri2; DRI2=$enableval +else + DRI2=auto +fi - ac_cv_lib_rt_clock_gettime=no +# Check whether --enable-xinerama was given. +if test "${enable_xinerama+set}" = set; then : + enableval=$enable_xinerama; XINERAMA=$enableval +else + XINERAMA=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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then - have_clock_gettime=-lrt +# Check whether --enable-xf86vidmode was given. +if test "${enable_xf86vidmode+set}" = set; then : + enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval else - have_clock_gettime=no + XF86VIDMODE=auto fi +# Check whether --enable-xace was given. +if test "${enable_xace+set}" = set; then : + enableval=$enable_xace; XACE=$enableval +else + XACE=yes fi -done - - -{ $as_echo "$as_me:$LINENO: checking for a useful monotonic clock ..." >&5 -$as_echo_n "checking for a useful monotonic clock ...... " >&6; } -if ! test "x$have_clock_gettime" = xno; then - if ! test "x$have_clock_gettime" = xyes; then - CLOCK_LIBS="$have_clock_gettime" - else - CLOCK_LIBS="" - fi +# Check whether --enable-xselinux was given. +if test "${enable_xselinux+set}" = set; then : + enableval=$enable_xselinux; XSELINUX=$enableval +else + XSELINUX=no +fi - LIBS_SAVE="$LIBS" - LIBS="$CLOCK_LIBS" - CPPFLAGS_SAVE="$CPPFLAGS" +# Check whether --enable-xcsecurity was given. +if test "${enable_xcsecurity+set}" = set; then : + enableval=$enable_xcsecurity; XCSECURITY=$enableval +else + XCSECURITY=no +fi - if test x"$glibc" = xyes; then - CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" - fi +# Check whether --enable-xcalibrate was given. +if test "${enable_xcalibrate+set}" = set; then : + enableval=$enable_xcalibrate; XCALIBRATE=$enableval +else + XCALIBRATE=no +fi - if test "$cross_compiling" = yes; then - MONOTONIC_CLOCK="cross compiling" +# Check whether --enable-tslib was given. +if test "${enable_tslib+set}" = set; then : + enableval=$enable_tslib; TSLIB=$enableval else - cat >conftest.$ac_ext <<_ACEOF + TSLIB=no +fi -#include +# Check whether --enable-multibuffer was given. +if test "${enable_multibuffer+set}" = set; then : + enableval=$enable_multibuffer; MULTIBUFFER=$enableval +else + MULTIBUFFER=no +fi -int main(int argc, char *argv[]) { - struct timespec tp; +# Check whether --enable-dbe was given. +if test "${enable_dbe+set}" = set; then : + enableval=$enable_dbe; DBE=$enableval +else + DBE=yes +fi - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) - return 0; - else - return 1; -} +# Check whether --enable-xf86bigfont was given. +if test "${enable_xf86bigfont+set}" = set; then : + enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval +else + XF86BIGFONT=no +fi -_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 - MONOTONIC_CLOCK=yes +# Check whether --enable-dpms was given. +if test "${enable_dpms+set}" = set; then : + enableval=$enable_dpms; DPMSExtension=$enableval 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 + DPMSExtension=yes +fi -( exit $ac_status ) -MONOTONIC_CLOCK=no +# Check whether --enable-config-dbus was given. +if test "${enable_config_dbus+set}" = set; then : + enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval +else + CONFIG_DBUS_API=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 + +# Check whether --enable-config-hal was given. +if test "${enable_config_hal+set}" = set; then : + enableval=$enable_config_hal; CONFIG_HAL=$enableval +else + CONFIG_HAL=auto fi +# Check whether --enable-xfree86-utils was given. +if test "${enable_xfree86_utils+set}" = set; then : + enableval=$enable_xfree86_utils; XF86UTILS=$enableval +else + XF86UTILS=yes +fi +# Check whether --enable-xaa was given. +if test "${enable_xaa+set}" = set; then : + enableval=$enable_xaa; XAA=$enableval +else + XAA=yes +fi - LIBS="$LIBS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" +# Check whether --enable-vgahw was given. +if test "${enable_vgahw+set}" = set; then : + enableval=$enable_vgahw; VGAHW=$enableval else - MONOTONIC_CLOCK=no + VGAHW=yes fi -{ $as_echo "$as_me:$LINENO: result: $MONOTONIC_CLOCK" >&5 -$as_echo "$MONOTONIC_CLOCK" >&6; } +# Check whether --enable-vbe was given. +if test "${enable_vbe+set}" = set; then : + enableval=$enable_vbe; VBE=$enableval +else + VBE=yes +fi -if test "x$MONOTONIC_CLOCK" = xyes; then +# Check whether --enable-int10-module was given. +if test "${enable_int10_module+set}" = set; then : + enableval=$enable_int10_module; INT10MODULE=$enableval +else + INT10MODULE=yes +fi -cat >>confdefs.h <<\_ACEOF -#define MONOTONIC_CLOCK 1 -_ACEOF - LIBS="$LIBS $CLOCK_LIBS" +# Check whether --enable-xorg was given. +if test "${enable_xorg+set}" = set; then : + enableval=$enable_xorg; XORG=$enableval +else + XORG=auto fi - if test "x$XV" = xyes; then - XV_TRUE= - XV_FALSE='#' +# Check whether --enable-dmx was given. +if test "${enable_dmx+set}" = set; then : + enableval=$enable_dmx; DMX=$enableval else - XV_TRUE='#' - XV_FALSE= + DMX=auto fi -if test "x$XV" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define XV 1 -_ACEOF +# Check whether --enable-xvfb was given. +if test "${enable_xvfb+set}" = set; then : + enableval=$enable_xvfb; XVFB=$enableval +else + XVFB=yes +fi +# Check whether --enable-xnest was given. +if test "${enable_xnest+set}" = set; then : + enableval=$enable_xnest; XNEST=$enableval +else + XNEST=auto +fi -cat >>confdefs.h <<\_ACEOF -#define XvExtension 1 -_ACEOF +# Check whether --enable-xquartz was given. +if test "${enable_xquartz+set}" = set; then : + enableval=$enable_xquartz; XQUARTZ=$enableval +else + XQUARTZ=auto +fi - REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" +# Check whether --enable-standalone-xpbproxy was given. +if test "${enable_standalone_xpbproxy+set}" = set; then : + enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval else - XVMC=no + STANDALONE_XPBPROXY=no fi - if test "x$XVMC" = xyes; then - XVMC_TRUE= - XVMC_FALSE='#' +# Check whether --enable-xwin was given. +if test "${enable_xwin+set}" = set; then : + enableval=$enable_xwin; XWIN=$enableval else - XVMC_TRUE='#' - XVMC_FALSE= + XWIN=auto fi -if test "x$XVMC" = xyes; then +# Check whether --enable-kdrive was given. +if test "${enable_kdrive+set}" = set; then : + enableval=$enable_kdrive; KDRIVE=$enableval +else + KDRIVE=no +fi -cat >>confdefs.h <<\_ACEOF -#define XvMCExtension 1 -_ACEOF +# Check whether --enable-xephyr was given. +if test "${enable_xephyr+set}" = set; then : + enableval=$enable_xephyr; XEPHYR=$enableval +else + XEPHYR=auto +fi +# Check whether --enable-xfake was given. +if test "${enable_xfake+set}" = set; then : + enableval=$enable_xfake; XFAKE=$enableval +else + XFAKE=auto fi - if test "x$XREGISTRY" = xyes; then - XREGISTRY_TRUE= - XREGISTRY_FALSE='#' +# Check whether --enable-xfbdev was given. +if test "${enable_xfbdev+set}" = set; then : + enableval=$enable_xfbdev; XFBDEV=$enableval else - XREGISTRY_TRUE='#' - XREGISTRY_FALSE= + XFBDEV=auto fi -if test "x$XREGISTRY" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XREGISTRY 1 -_ACEOF +# Check whether --enable-install-setuid was given. +if test "${enable_install_setuid+set}" = set; then : + enableval=$enable_install_setuid; SETUID=$enableval +else + SETUID=auto fi - if test "x$COMPOSITE" = xyes; then - COMPOSITE_TRUE= - COMPOSITE_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if we can install the Xorg server as root" >&5 +$as_echo_n "checking to see if we can install the Xorg server as root... " >&6; } +if test "x$SETUID" = "xauto" ; then + case $host_os in + darwin*) SETUID="no" ;; + *) + case $host_cpu in + sparc) SETUID="no" ;; + *) SETUID="yes" ;; + esac + esac + if test "x$SETUID" = xyes; then + touch testfile + chown root testfile > /dev/null 2>&1 || SETUID="no" + rm -f testfile + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETUID" >&5 +$as_echo "$SETUID" >&6; } + if test "x$SETUID" = "xyes"; then + INSTALL_SETUID_TRUE= + INSTALL_SETUID_FALSE='#' else - COMPOSITE_TRUE='#' - COMPOSITE_FALSE= + INSTALL_SETUID_TRUE='#' + INSTALL_SETUID_FALSE= fi -if test "x$COMPOSITE" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define COMPOSITE 1 -_ACEOF - REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" - COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' - COMPOSITE_INC='-I$(top_srcdir)/composite' -fi - if test "x$MITSHM" = xyes; then - MITSHM_TRUE= - MITSHM_FALSE='#' +# Transport selection macro from xtrans.m4 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - MITSHM_TRUE='#' - MITSHM_FALSE= + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +int +main () +{ +return *(signal (0, 0)) (0) == 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int +else + ac_cv_type_signal=void +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } -if test "x$MITSHM" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define MITSHM 1 +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAS_SHM 1 -_ACEOF -fi - if test "x$RECORD" = xyes; then - RECORD_TRUE= - RECORD_FALSE='#' + + case $host_os in + mingw*) unixdef="no" ;; + *) unixdef="yes" ;; + esac + # Check whether --enable-unix-transport was given. +if test "${enable_unix_transport+set}" = set; then : + enableval=$enable_unix_transport; UNIXCONN=$enableval else - RECORD_TRUE='#' - RECORD_FALSE= + UNIXCONN=$unixdef fi -if test "x$RECORD" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define XRECORD 1 -_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 +$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } + if test "$UNIXCONN" = "yes"; then - REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" - RECORD_LIB='$(top_builddir)/record/librecord.la' -fi +$as_echo "#define UNIXCONN 1" >>confdefs.h - if test "x$SCREENSAVER" = xyes; then - SCREENSAVER_TRUE= - SCREENSAVER_FALSE='#' + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 +$as_echo "$UNIXCONN" >&6; } + # Check whether --enable-tcp-transport was given. +if test "${enable_tcp_transport+set}" = set; then : + enableval=$enable_tcp_transport; TCPCONN=$enableval else - SCREENSAVER_TRUE='#' - SCREENSAVER_FALSE= + TCPCONN=yes fi -if test "x$SCREENSAVER" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 +$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 +$as_echo "$TCPCONN" >&6; } + if test "$TCPCONN" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define SCREENSAVER 1 -_ACEOF +$as_echo "#define TCPCONN 1" >>confdefs.h - REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" -fi - if test "x$RES" = xyes; then - RES_TRUE= - RES_FALSE='#' + # SVR4 hides these in libraries other than libc + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +$as_echo_n "checking for library containing socket... " >&6; } +if test "${ac_cv_search_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 else - RES_TRUE='#' - RES_FALSE= -fi - -if test "x$RES" = xyes; then + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define RES 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 socket (); +int +main () +{ +return socket (); + ; + return 0; +} _ACEOF - - REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_socket=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_socket+set}" = set; then : + break fi +done +if test "${ac_cv_search_socket+set}" = set; then : -if test "x$GLX" = xyes; then +else + ac_cv_search_socket=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +$as_echo "$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5 -$as_echo_n "checking for XLIB... " >&6; } +fi -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\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +$as_echo_n "checking for library containing gethostbyname... " >&6; } +if test "${ac_cv_search_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes + ac_func_search_save_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 gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_gethostbyname=$ac_res fi - else - pkg_failed=untried +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_gethostbyname+set}" = set; then : + break 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\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` +done +if test "${ac_cv_search_gethostbyname+set}" = set; then : + else - pkg_failed=yes + ac_cv_search_gethostbyname=no fi - else - pkg_failed=untried +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +$as_echo "$ac_cv_search_gethostbyname" >&6; } +ac_res=$ac_cv_search_gethostbyname +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 +$as_echo_n "checking for main in -lws2_32... " >&6; } +if test "${ac_cv_lib_ws2_32_main+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lws2_32 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ws2_32_main=yes else - _pkg_short_errors_supported=no + ac_cv_lib_ws2_32_main=no fi - if test $_pkg_short_errors_supported = yes; then - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1` - else - XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XLIB_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements (x11) were not met: +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_ws2_32_main" >&5 +$as_echo "$ac_cv_lib_ws2_32_main" >&6; } +if test "x$ac_cv_lib_ws2_32_main" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBWS2_32 1 +_ACEOF -$XLIB_PKG_ERRORS + LIBS="-lws2_32 $LIBS" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +fi +ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_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 (x11) were not met: -$XLIB_PKG_ERRORS + # Needs to come after above checks for libsocket & libnsl for SVR4 systems + # Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; IPV6CONN=$enableval +else + ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +if test "x$ac_cv_func_getaddrinfo" = x""yes; then : + IPV6CONN=yes +else + IPV6CONN=no +fi -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +fi -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_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. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 +$as_echo_n "checking if IPv6 support should be built... " >&6; } + if test "$IPV6CONN" = "yes"; then -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +$as_echo "#define IPv6 1" >>confdefs.h -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 +$as_echo "$IPV6CONN" >&6; } -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + # 4.3BSD-Reno added a new member to struct sockaddr_in + ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" " +#include +#include +#include -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -else - XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS - XLIB_LIBS=$pkg_cv_XLIB_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi +" +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then : -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GL" >&5 -$as_echo_n "checking for GL... " >&6; } +$as_echo "#define BSD44SOCKETS 1" >>confdefs.h -if test -n "$GL_CFLAGS"; then - pkg_cv_GL_CFLAGS="$GL_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GL_LIBS"; then - pkg_cv_GL_LIBS="$GL_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried fi + # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " +$ac_includes_default +#include +" +if test "x$ac_cv_type_socklen_t" = x""yes; then : -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 - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1` - else - GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBGL) were not met: +cat >>confdefs.h <<_ACEOF +#define HAVE_SOCKLEN_T 1 +_ACEOF -$GL_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +fi -Alternatively, you may set the environment variables GL_CFLAGS -and GL_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 ($GLPROTO $LIBGL) were not met: -$GL_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + fi + case $host_os in + solaris*|sco*|sysv4*) localdef="yes" ;; + *) localdef="no" ;; + esac + # Check whether --enable-local-transport was given. +if test "${enable_local_transport+set}" = set; then : + enableval=$enable_local_transport; LOCALCONN=$enableval +else + LOCALCONN=$localdef +fi -Alternatively, you may set the environment variables GL_CFLAGS -and GL_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. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 +$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 +$as_echo "$LOCALCONN" >&6; } + if test "$LOCALCONN" = "yes"; then -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +$as_echo "#define LOCALCONN 1" >>confdefs.h -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + fi -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + +# Secure RPC detection macro from xtrans.m4 + + # Check whether --enable-secure-rpc was given. +if test "${enable_secure_rpc+set}" = set; then : + enableval=$enable_secure_rpc; SECURE_RPC=$enableval else - GL_CFLAGS=$pkg_cv_GL_CFLAGS - GL_LIBS=$pkg_cv_GL_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : + SECURE_RPC="try" fi -cat >>confdefs.h <<\_ACEOF -#define GLXEXT 1 + if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then + FOUND_SECURE_RPC="no" + for ac_func in authdes_seccreate authdes_create +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 + FOUND_SECURE_RPC="yes" +fi +done - GLX_LIBS='$(top_builddir)/glx/libglx.la' - GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" + if test "x$FOUND_SECURE_RPC" = "xno" ; then + if test "x$SECURE_RPC" = "xyes" ; then + as_fn_error "Secure RPC requested, but required functions not found" "$LINENO" 5 + fi + SECURE_RPC="no" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getsecretkey" >&5 +$as_echo_n "checking for library containing getsecretkey... " >&6; } +if test "${ac_cv_search_getsecretkey+set}" = set; then : + $as_echo_n "(cached) " >&6 else - GLX=no + ac_func_search_save_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 getsecretkey (); +int +main () +{ +return getsecretkey (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rpcsvc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_getsecretkey=$ac_res fi - if test "x$GLX" = xyes; then - GLX_TRUE= - GLX_FALSE='#' +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_getsecretkey+set}" = set; then : + break +fi +done +if test "${ac_cv_search_getsecretkey+set}" = set; then : + else - GLX_TRUE='#' - GLX_FALSE= + ac_cv_search_getsecretkey=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getsecretkey" >&5 +$as_echo "$ac_cv_search_getsecretkey" >&6; } +ac_res=$ac_cv_search_getsecretkey +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi -if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then + SECURE_RPC="yes" + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 +$as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } + if test "x$SECURE_RPC" = "xyes" ; then -cat >>confdefs.h <<\_ACEOF -#define AIGLX 1 -_ACEOF +$as_echo "#define SECURE_RPC 1" >>confdefs.h + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SECURE_RPC" >&5 +$as_echo "$SECURE_RPC" >&6; } + + if test "x$SECURE_RPC" = xyes; then + SECURE_RPC_TRUE= + SECURE_RPC_FALSE='#' else - AIGLX=no -fi - if test "x$AIGLX" = xyes; then - AIGLX_TRUE= - AIGLX_FALSE='#' -else - AIGLX_TRUE='#' - AIGLX_FALSE= + SECURE_RPC_TRUE='#' + SECURE_RPC_FALSE= fi -if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then - GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" - GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" + if test "x$INT10" = xvm86; then + INT10_VM86_TRUE= + INT10_VM86_FALSE='#' +else + INT10_VM86_TRUE='#' + INT10_VM86_FALSE= fi - - if test "x$DRI" = xyes; then - DRI_TRUE= - DRI_FALSE='#' + if test "x$INT10" = xx86emu; then + INT10_X86EMU_TRUE= + INT10_X86EMU_FALSE='#' else - DRI_TRUE='#' - DRI_FALSE= + INT10_X86EMU_TRUE='#' + INT10_X86EMU_FALSE= fi -if test "x$DRI" = xyes; then + if test "x$INT10" = xstub; then + INT10_STUB_TRUE= + INT10_STUB_FALSE='#' +else + INT10_STUB_TRUE='#' + INT10_STUB_FALSE= +fi -cat >>confdefs.h <<\_ACEOF -#define XF86DRI 1 +if test "x$INT10" = xyes; then + for ac_header in sys/vm86.h sys/io.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 -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DRIPROTO" >&5 -$as_echo_n "checking for DRIPROTO... " >&6; } +done -if test -n "$DRIPROTO_CFLAGS"; then - pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRIPROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRIPROTO" 2>/dev/null` -else - pkg_failed=yes fi - else - pkg_failed=untried -fi -if test -n "$DRIPROTO_LIBS"; then - pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRIPROTO_LIBS=`$PKG_CONFIG --libs "$DRIPROTO" 2>/dev/null` + + if test "x$BUILDDOCS" = xyes; then + BUILDDOCS_TRUE= + BUILDDOCS_FALSE='#' else - pkg_failed=yes -fi - else - pkg_failed=untried + BUILDDOCS_TRUE='#' + BUILDDOCS_FALSE= fi -if test $pkg_failed = yes; then +if test x$XORG_SGML_PATH = x ; then + XORG_SGML_PATH=$prefix/share/sgml +fi +HAVE_DEFS_ENT= -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +if test x"$cross_compiling" = x"yes" ; then + HAVE_DEFS_ENT=no else - _pkg_short_errors_supported=no + as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XORG_SGML_PATH/X11/defs.ent" >&5 +$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "$XORG_SGML_PATH/X11/defs.ent"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +eval ac_res=\$$as_ac_File + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_File + if test "x$as_val" = x""yes; then : + HAVE_DEFS_ENT=yes fi - if test $_pkg_short_errors_supported = yes; then - DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1` - else - DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRIPROTO_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements ($DRIPROTO) were not met: - -$DRIPROTO_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 DRIPROTO_CFLAGS -and DRIPROTO_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 ($DRIPROTO) were not met: - -$DRIPROTO_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +fi -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_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. +# Extract the first word of "linuxdoc", so it can be a program name with args. +set dummy linuxdoc; 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_LINUXDOC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $LINUXDOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_LINUXDOC="$LINUXDOC" # 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_LINUXDOC="$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 -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + ;; +esac +fi +LINUXDOC=$ac_cv_path_LINUXDOC +if test -n "$LINUXDOC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUXDOC" >&5 +$as_echo "$LINUXDOC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -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 DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +# Extract the first word of "ps2pdf", so it can be a program name with args. +set dummy ps2pdf; 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_PS2PDF+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PS2PDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_PS2PDF="$PS2PDF" # 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_PS2PDF="$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 -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + ;; +esac +fi +PS2PDF=$ac_cv_path_PS2PDF +if test -n "$PS2PDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5 +$as_echo "$PS2PDF" >&6; } else - DRIPROTO_CFLAGS=$pkg_cv_DRIPROTO_CFLAGS - DRIPROTO_LIBS=$pkg_cv_DRIPROTO_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&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 DRI" >&5 -$as_echo_n "checking for DRI... " >&6; } -if test -n "$DRI_CFLAGS"; then - pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBDRI" 2>/dev/null` + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build documentation" >&5 +$as_echo_n "checking Whether to build documentation... " >&6; } + +if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then + BUILDDOC=yes else - pkg_failed=yes -fi - else - pkg_failed=untried + BUILDDOC=no fi -if test -n "$DRI_LIBS"; then - pkg_cv_DRI_LIBS="$DRI_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBDRI" 2>/dev/null` + + if test x$BUILDDOC = xyes; then + BUILD_LINUXDOC_TRUE= + BUILD_LINUXDOC_FALSE='#' else - pkg_failed=yes -fi - else - pkg_failed=untried + BUILD_LINUXDOC_TRUE='#' + BUILD_LINUXDOC_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDDOC" >&5 +$as_echo "$BUILDDOC" >&6; } -if test $pkg_failed = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build pdf documentation" >&5 +$as_echo_n "checking Whether to build pdf documentation... " >&6; } -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then + BUILDPDFDOC=yes else - _pkg_short_errors_supported=no + BUILDPDFDOC=no fi - if test $_pkg_short_errors_supported = yes; then - DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1` - else - DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRI_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBDRI) were not met: + if test x$BUILDPDFDOC = xyes; then + BUILD_PDFDOC_TRUE= + BUILD_PDFDOC_FALSE='#' +else + BUILD_PDFDOC_TRUE='#' + BUILD_PDFDOC_FALSE= +fi -$DRI_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDPDFDOC" >&5 +$as_echo "$BUILDPDFDOC" >&6; } -Alternatively, you may set the environment variables DRI_CFLAGS -and DRI_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 ($GLPROTO $LIBDRI) were not met: +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +MAKE_PDF="$PS2PDF" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" -$DRI_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 DRI_CFLAGS -and DRI_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 DRI_CFLAGS -and DRI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -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 DRI_CFLAGS -and DRI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + if test "x$INSTALL_LIBXF86CONFIG" = xyes; then + INSTALL_LIBXF86CONFIG_TRUE= + INSTALL_LIBXF86CONFIG_FALSE='#' else - DRI_CFLAGS=$pkg_cv_DRI_CFLAGS - DRI_LIBS=$pkg_cv_DRI_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - + INSTALL_LIBXF86CONFIG_TRUE='#' + INSTALL_LIBXF86CONFIG_FALSE= fi -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DRI2PROTO" >&5 -$as_echo_n "checking for DRI2PROTO... " >&6; } +case $host_os in + darwin*) + DRI2=no -if test -n "$DRI2PROTO_CFLAGS"; then - pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null` + if test x$XQUARTZ = xauto; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xquartz" >&5 +$as_echo_n "checking whether to build Xquartz... " >&6; } +if test "${xorg_cv_Carbon_framework+set}" = set; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DRI2PROTO_LIBS"; then - pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null` + + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -framework Carbon" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +char FSFindFolder(); int main() { FSFindFolder(); return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + xorg_cv_Carbon_framework=yes else - pkg_failed=yes + xorg_cv_Carbon_framework=no fi - else - pkg_failed=untried +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_Carbon_framework" >&5 +$as_echo "$xorg_cv_Carbon_framework" >&6; } + if test "X$xorg_cv_Carbon_framework" = Xyes; then + XQUARTZ=yes + else + XQUARTZ=no + fi + fi + if test "x$XQUARTZ" = xyes ; then + XQUARTZ=yes + XVFB=no + XNEST=no -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 - DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1` - else - DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRI2PROTO_PKG_ERRORS" >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - HAVE_DRI2PROTO=no -elif test $pkg_failed = untried; then - HAVE_DRI2PROTO=no -else - DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS - DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_DRI2PROTO=yes -fi -case "$DRI2,$HAVE_DRI2PROTO" in - yes,no) - { { $as_echo "$as_me:$LINENO: error: DRI2 requested, but dri2proto not found." >&5 -$as_echo "$as_me: error: DRI2 requested, but dri2proto not found." >&2;} - { (exit 1); exit 1; }; } + COMPOSITE=no + DGA=no + DPMSExtension=no + XF86VIDMODE=no + fi ;; - yes,yes | auto,yes) + *) XQUARTZ=no ;; +esac -cat >>confdefs.h <<\_ACEOF -#define DRI2 1 -_ACEOF +XEXT_INC='-I$(top_srcdir)/Xext' +XEXT_LIB='$(top_builddir)/Xext/libXext.la' +XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - DRI2=yes - ;; -esac - if test "x$DRI2" = xyes; then - DRI2_TRUE= - DRI2_FALSE='#' -else - DRI2_TRUE='#' - DRI2_FALSE= -fi +VIDEOPROTO="videoproto" +COMPOSITEPROTO="compositeproto >= 0.4" +RECORDPROTO="recordproto >= 1.13.99.1" +SCRNSAVERPROTO="scrnsaverproto >= 1.1" +RESOURCEPROTO="resourceproto" +DRIPROTO="xf86driproto >= 2.1.0" +DRI2PROTO="dri2proto >= 2.1" +XINERAMAPROTO="xineramaproto" +BIGFONTPROTO="xf86bigfontproto >= 1.2.0" +XCALIBRATEPROTO="xcalibrateproto" +DGAPROTO="xf86dgaproto >= 2.0.99.1" +GLPROTO="glproto >= 1.4.9" +DMXPROTO="dmxproto >= 2.2.99.1" +VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" +WINDOWSWMPROTO="windowswmproto" +APPLEWMPROTO="applewmproto >= 1.4" + +REQUIRED_MODULES="randrproto >= 1.2.99.3 renderproto >= 0.11 fixesproto >= 4.1 damageproto >= 1.1 xcmiscproto >= 1.2.0 xextproto >= 7.0.99.3 xproto >= 7.0.13 xtrans >= 1.2.2 bigreqsproto >= 1.1.0 fontsproto inputproto >= 1.9.99.902 kbproto >= 1.0.3" +REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20" +LIBAPPLEWM="applewm >= 1.4" +LIBDMX="dmx >= 1.0.99.1" +LIBDRI="dri >= 7.1.0" +LIBDRM="libdrm >= 2.3.0" +LIBGL="gl >= 7.1.0" +LIBXEXT="xext >= 1.0.99.4" +LIBXI="xi >= 1.2.99.1" +LIBXTST="xtst >= 1.0.99.2" +LIBPCIACCESS="pciaccess >= 0.8.0" +LIBGLIB="glib-2.0 >= 2.16" -if test "x$DRI" = xyes || test "x$DRI2" = xyes; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for LIBDRM" >&5 -$as_echo_n "checking for LIBDRM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 +$as_echo_n "checking for DBUS... " >&6; } -if test -n "$LIBDRM_CFLAGS"; then - pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$LIBDRM_LIBS"; then - pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22821,358 +16420,219 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"` else - LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` fi # Put the nasty error message in config.log where it belongs - echo "$LIBDRM_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDRM) were not met: - -$LIBDRM_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 LIBDRM_CFLAGS -and LIBDRM_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 ($LIBDRM) were not met: - -$LIBDRM_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + echo "$DBUS_PKG_ERRORS" >&5 -Alternatively, you may set the environment variables LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_DBUS=no 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 LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -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 LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + HAVE_DBUS=no else - LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS - LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + HAVE_DBUS=yes fi +if test "x$HAVE_DBUS" = xyes; then +$as_echo "#define HAVE_DBUS 1" >>confdefs.h fi - -if test "x$DRI2" = xyes; then - save_CFLAGS=$CFLAGS - CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifndef __DRI_DRI2 -#error DRI2 extension not available. -#endif -_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 - HAVE_DRI2EXTENSION=yes + if test "x$HAVE_DBUS" = xyes; then + HAVE_DBUS_TRUE= + HAVE_DBUS_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - HAVE_DRI2EXTENSION=no + HAVE_DBUS_TRUE='#' + HAVE_DBUS_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$save_CFLAGS - if test "x$HAVE_DRI2EXTENSION" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define DRI2_AIGLX 1 -_ACEOF - DRI2_AIGLX=yes - else - { $as_echo "$as_me:$LINENO: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5 -$as_echo "$as_me: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&6;} - DRI2_AIGLX=no - fi -fi - if test "x$DRI2_AIGLX" = xyes; then - DRI2_AIGLX_TRUE= - DRI2_AIGLX_FALSE='#' -else - DRI2_AIGLX_TRUE='#' - DRI2_AIGLX_FALSE= +if test "x$CONFIG_DBUS_API" = xauto; then + CONFIG_DBUS_API="$HAVE_DBUS" fi +if test "x$CONFIG_DBUS_API" = xyes; then + if ! test "x$HAVE_DBUS" = xyes; then + as_fn_error "D-Bus configuration API requested, but D-Bus is not installed." "$LINENO" 5 + fi +$as_echo "#define CONFIG_DBUS_API 1" >>confdefs.h - if test "x$XINERAMA" = xyes; then - XINERAMA_TRUE= - XINERAMA_FALSE='#' + CONFIG_NEED_DBUS="yes" +fi + if test "x$CONFIG_DBUS_API" = xyes; then + CONFIG_DBUS_API_TRUE= + CONFIG_DBUS_API_FALSE='#' else - XINERAMA_TRUE='#' - XINERAMA_FALSE= + CONFIG_DBUS_API_TRUE='#' + CONFIG_DBUS_API_FALSE= fi -if test "x$XINERAMA" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define XINERAMA 1 -_ACEOF -cat >>confdefs.h <<\_ACEOF -#define PANORAMIX 1 -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5 +$as_echo_n "checking for HAL... " >&6; } - REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" +if test -n "$PKG_CONFIG"; then + if test -n "$HAL_CFLAGS"; then + pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` +else + pkg_failed=yes fi - - if test "x$XACE" = xyes; then - XACE_TRUE= - XACE_FALSE='#' + fi else - XACE_TRUE='#' - XACE_FALSE= + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$HAL_LIBS"; then + pkg_cv_HAL_LIBS="$HAL_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -if test "x$XACE" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XACE 1 -_ACEOF -fi +if test $pkg_failed = yes; then - if test "x$XSELINUX" = xyes; then - XSELINUX_TRUE= - XSELINUX_FALSE='#' +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - XSELINUX_TRUE='#' - XSELINUX_FALSE= + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"` + else + HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 -if test "x$XSELINUX" = xyes; then - if test "x$XACE" != xyes; then - { { $as_echo "$as_me:$LINENO: error: cannot build SELinux extension without X-ACE" >&5 -$as_echo "$as_me: error: cannot build SELinux extension without X-ACE" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_HAL=no +elif test $pkg_failed = untried; then + HAVE_HAL=no +else + HAL_CFLAGS=$pkg_cv_HAL_CFLAGS + HAL_LIBS=$pkg_cv_HAL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_HAL=yes +fi +if test "x$CONFIG_HAL" = xauto; then + CONFIG_HAL="$HAVE_HAL" +fi +if test "x$CONFIG_HAL" = xyes; then + if ! test "x$HAVE_HAL" = xyes; then + as_fn_error "HAL hotplug API requested, but HAL is not installed." "$LINENO" 5 fi -for ac_header in selinux/selinux.h selinux/avc.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 +$as_echo "#define CONFIG_HAL 1" >>confdefs.h + + REQUIRED_LIBS="$REQUIRED_LIBS hal" + CONFIG_NEED_DBUS="yes" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test "x$CONFIG_HAL" = xyes; then + CONFIG_HAL_TRUE= + CONFIG_HAL_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + CONFIG_HAL_TRUE='#' + CONFIG_HAL_FALSE= 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 +if test "x$CONFIG_NEED_DBUS" = xyes; then + REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" - ac_header_preproc=no +$as_echo "#define CONFIG_NEED_DBUS 1" >>confdefs.h + +fi + if test "x$CONFIG_NEED_DBUS" = xyes; then + CONFIG_NEED_DBUS_TRUE= + CONFIG_NEED_DBUS_FALSE='#' +else + CONFIG_NEED_DBUS_TRUE='#' + CONFIG_NEED_DBUS_FALSE= fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +CONFIG_LIB='$(top_builddir)/config/libconfig.la' -# 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 +if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then + USE_SIGIO_BY_DEFAULT_VALUE=TRUE else - eval "$as_ac_Header=\$ac_header_preproc" + USE_SIGIO_BY_DEFAULT_VALUE=FALSE 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 +cat >>confdefs.h <<_ACEOF +#define USE_SIGIO_BY_DEFAULT $USE_SIGIO_BY_DEFAULT_VALUE _ACEOF -else - { { $as_echo "$as_me:$LINENO: error: SELinux include files not found" >&5 -$as_echo "$as_me: error: SELinux include files not found" >&2;} - { (exit 1); exit 1; }; } -fi -done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc..." >&5 +$as_echo_n "checking for glibc...... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#ifndef __GLIBC__ +#error +#endif -{ $as_echo "$as_me:$LINENO: checking for avc_init in -lselinux" >&5 -$as_echo_n "checking for avc_init in -lselinux... " >&6; } -if test "${ac_cv_lib_selinux_avc_init+set}" = set; then +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + glibc=yes +else + glibc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibc" >&5 +$as_echo "$glibc" >&6; } + +for ac_func in clock_gettime +do : + ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +if test "x$ac_cv_func_clock_gettime" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CLOCK_GETTIME 1 +_ACEOF + have_clock_gettime=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lselinux $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -23181,1040 +16641,935 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char avc_init (); +char clock_gettime (); int main () { -return avc_init (); +return clock_gettime (); ; 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_selinux_avc_init=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_selinux_avc_init=no + ac_cv_lib_rt_clock_gettime=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_selinux_avc_init" >&5 -$as_echo "$ac_cv_lib_selinux_avc_init" >&6; } -if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSELINUX 1 -_ACEOF - - LIBS="-lselinux $LIBS" - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : + have_clock_gettime=-lrt else - { { $as_echo "$as_me:$LINENO: error: SELinux library not found" >&5 -$as_echo "$as_me: error: SELinux library not found" >&2;} - { (exit 1); exit 1; }; } -fi - - -for ac_header in libaudit.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 + have_clock_gettime=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; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -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}: checking for a useful monotonic clock ..." >&5 +$as_echo_n "checking for a useful monotonic clock ...... " >&6; } -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$have_clock_gettime" = xno; then + if ! test "x$have_clock_gettime" = xyes; then + CLOCK_LIBS="$have_clock_gettime" + else + CLOCK_LIBS="" + fi -# 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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; } + LIBS_SAVE="$LIBS" + LIBS="$CLOCK_LIBS" + CPPFLAGS_SAVE="$CPPFLAGS" -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 + if test x"$glibc" = xyes; then + CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" + fi + if test "$cross_compiling" = yes; then : + MONOTONIC_CLOCK="cross compiling" else - { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system headers" >&5 -$as_echo "$as_me: error: SELinux extension requires audit system headers" >&2;} - { (exit 1); exit 1; }; } -fi - -done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -{ $as_echo "$as_me:$LINENO: checking for audit_open in -laudit" >&5 -$as_echo_n "checking for audit_open in -laudit... " >&6; } -if test "${ac_cv_lib_audit_audit_open+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-laudit $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +int main(int argc, char *argv[]) { + struct timespec tp; -/* 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 audit_open (); -int -main () -{ -return audit_open (); - ; - return 0; + if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) + return 0; + else + return 1; } + _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_audit_audit_open=yes +if ac_fn_c_try_run "$LINENO"; then : + MONOTONIC_CLOCK=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_audit_audit_open=no + MONOTONIC_CLOCK=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 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audit_audit_open" >&5 -$as_echo "$ac_cv_lib_audit_audit_open" >&6; } -if test "x$ac_cv_lib_audit_audit_open" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBAUDIT 1 -_ACEOF - LIBS="-laudit $LIBS" + LIBS="$LIBS_SAVE" + CPPFLAGS="$CPPFLAGS_SAVE" else - { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system library" >&5 -$as_echo "$as_me: error: SELinux extension requires audit system library" >&2;} - { (exit 1); exit 1; }; } + MONOTONIC_CLOCK=no fi - { $as_echo "$as_me:$LINENO: checking whether avc_netlink_acquire_fd is declared" >&5 -$as_echo_n "checking whether avc_netlink_acquire_fd is declared... " >&6; } -if test "${ac_cv_have_decl_avc_netlink_acquire_fd+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. */ -#include +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONOTONIC_CLOCK" >&5 +$as_echo "$MONOTONIC_CLOCK" >&6; } -int -main () -{ -#ifndef avc_netlink_acquire_fd - (void) avc_netlink_acquire_fd; -#endif +if test "x$MONOTONIC_CLOCK" = xyes; then + +$as_echo "#define MONOTONIC_CLOCK 1" >>confdefs.h + + LIBS="$LIBS $CLOCK_LIBS" +fi + + if test "x$XV" = xyes; then + XV_TRUE= + XV_FALSE='#' +else + XV_TRUE='#' + XV_FALSE= +fi + +if test "x$XV" = xyes; then + +$as_echo "#define XV 1" >>confdefs.h - ; - 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_cv_have_decl_avc_netlink_acquire_fd=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_avc_netlink_acquire_fd=no +$as_echo "#define XvExtension 1" >>confdefs.h + + REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" +else + XVMC=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$XVMC" = xyes; then + XVMC_TRUE= + XVMC_FALSE='#' +else + XVMC_TRUE='#' + XVMC_FALSE= fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_avc_netlink_acquire_fd" >&5 -$as_echo "$ac_cv_have_decl_avc_netlink_acquire_fd" >&6; } -if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_AVC_NETLINK_ACQUIRE_FD 1 -_ACEOF +if test "x$XVMC" = xyes; then + +$as_echo "#define XvMCExtension 1" >>confdefs.h fi + if test "x$XREGISTRY" = xyes; then + XREGISTRY_TRUE= + XREGISTRY_FALSE='#' +else + XREGISTRY_TRUE='#' + XREGISTRY_FALSE= +fi -cat >>confdefs.h <<\_ACEOF -#define XSELINUX 1 -_ACEOF +if test "x$XREGISTRY" = xyes; then + +$as_echo "#define XREGISTRY 1" >>confdefs.h - SELINUX_LIB="-lselinux -laudit" fi - if test "x$XCSECURITY" = xyes; then - XCSECURITY_TRUE= - XCSECURITY_FALSE='#' + if test "x$COMPOSITE" = xyes; then + COMPOSITE_TRUE= + COMPOSITE_FALSE='#' else - XCSECURITY_TRUE='#' - XCSECURITY_FALSE= + COMPOSITE_TRUE='#' + COMPOSITE_FALSE= fi -if test "x$XCSECURITY" = xyes; then - if test "x$XACE" != xyes; then - { { $as_echo "$as_me:$LINENO: error: cannot build Security extension without X-ACE" >&5 -$as_echo "$as_me: error: cannot build Security extension without X-ACE" >&2;} - { (exit 1); exit 1; }; } - fi +if test "x$COMPOSITE" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XCSECURITY 1 -_ACEOF +$as_echo "#define COMPOSITE 1" >>confdefs.h + REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" + COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' + COMPOSITE_INC='-I$(top_srcdir)/composite' fi - if test "x$MULTIBUFFER" = xyes; then - MULTIBUFFER_TRUE= - MULTIBUFFER_FALSE='#' + if test "x$MITSHM" = xyes; then + MITSHM_TRUE= + MITSHM_FALSE='#' else - MULTIBUFFER_TRUE='#' - MULTIBUFFER_FALSE= + MITSHM_TRUE='#' + MITSHM_FALSE= fi -if test "x$MULTIBUFFER" = xyes; then +if test "x$MITSHM" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define MULTIBUFFER 1 -_ACEOF +$as_echo "#define MITSHM 1" >>confdefs.h + + +$as_echo "#define HAS_SHM 1" >>confdefs.h - # Requires xextproto which is always required fi - if test "x$DBE" = xyes; then - DBE_TRUE= - DBE_FALSE='#' + if test "x$RECORD" = xyes; then + RECORD_TRUE= + RECORD_FALSE='#' else - DBE_TRUE='#' - DBE_FALSE= + RECORD_TRUE='#' + RECORD_FALSE= fi -if test "x$DBE" = xyes; then +if test "x$RECORD" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define DBE 1 -_ACEOF +$as_echo "#define XRECORD 1" >>confdefs.h - DBE_LIB='$(top_builddir)/dbe/libdbe.la' + REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" + RECORD_LIB='$(top_builddir)/record/librecord.la' fi - if test "x$XF86BIGFONT" = xyes; then - XF86BIGFONT_TRUE= - XF86BIGFONT_FALSE='#' + if test "x$SCREENSAVER" = xyes; then + SCREENSAVER_TRUE= + SCREENSAVER_FALSE='#' else - XF86BIGFONT_TRUE='#' - XF86BIGFONT_FALSE= + SCREENSAVER_TRUE='#' + SCREENSAVER_FALSE= fi -if test "x$XF86BIGFONT" = xyes; then +if test "x$SCREENSAVER" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XF86BIGFONT 1 -_ACEOF +$as_echo "#define SCREENSAVER 1" >>confdefs.h - REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" + REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" fi - if test "x$DPMSExtension" = xyes; then - DPMSExtension_TRUE= - DPMSExtension_FALSE='#' + if test "x$RES" = xyes; then + RES_TRUE= + RES_FALSE='#' else - DPMSExtension_TRUE='#' - DPMSExtension_FALSE= + RES_TRUE='#' + RES_FALSE= fi -if test "x$DPMSExtension" = xyes; then +if test "x$RES" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define DPMSExtension 1 -_ACEOF +$as_echo "#define RES 1" >>confdefs.h + REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" fi -if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then +if test "x$GLX" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XCALIBRATE 1 -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5 +$as_echo_n "checking for XLIB... " >&6; } - REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO" +if test -n "$PKG_CONFIG"; then + if test -n "$XLIB_CFLAGS"; then + pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` else - XCALIBRATE=no + pkg_failed=yes fi - if test "x$XCALIBRATE" = xyes; then - XCALIBRATE_TRUE= - XCALIBRATE_FALSE='#' + fi else - XCALIBRATE_TRUE='#' - XCALIBRATE_FALSE= + pkg_failed=untried +fi +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\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 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" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -cat >>confdefs.h <<\_ACEOF -#define RENDER 1 -_ACEOF +if test $pkg_failed = yes; then -RENDER_LIB='$(top_builddir)/render/librender.la' -RENDER_INC='-I$(top_srcdir)/render' +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 --errors-to-stdout --print-errors "x11"` + else + XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XLIB_PKG_ERRORS" >&5 + as_fn_error "Package requirements (x11) were not met: -cat >>confdefs.h <<\_ACEOF -#define RANDR 1 -_ACEOF +$XLIB_PKG_ERRORS -RANDR_LIB='$(top_builddir)/randr/librandr.la' -RANDR_INC='-I$(top_srcdir)/randr' +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables XLIB_CFLAGS +and XLIB_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. -cat >>confdefs.h <<\_ACEOF -#define XFIXES 1 -_ACEOF +Alternatively, you may set the environment variables XLIB_CFLAGS +and XLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' -FIXES_INC='-I$(top_srcdir)/xfixes' +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +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 GL" >&5 +$as_echo_n "checking for GL... " >&6; } -cat >>confdefs.h <<\_ACEOF -#define DAMAGE 1 -_ACEOF +if test -n "$PKG_CONFIG"; then + if test -n "$GL_CFLAGS"; then + pkg_cv_GL_CFLAGS="$GL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GL_LIBS"; then + pkg_cv_GL_LIBS="$GL_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi -DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' -DAMAGE_INC='-I$(top_srcdir)/damageext' -MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' -MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' -# XINPUT extension is integral part of the server -XI_LIB='$(top_builddir)/Xi/libXi.la' -XI_INC='-I$(top_srcdir)/Xi' - if test "x$XF86UTILS" = xyes; then - XF86UTILS_TRUE= - XF86UTILS_FALSE='#' +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - XF86UTILS_TRUE='#' - XF86UTILS_FALSE= + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` + else + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_PKG_ERRORS" >&5 + + as_fn_error "Package requirements ($GLPROTO $LIBGL) were not met: + +$GL_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 GL_CFLAGS +and GL_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 GL_CFLAGS +and GL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + GL_CFLAGS=$pkg_cv_GL_CFLAGS + GL_LIBS=$pkg_cv_GL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + - if test "x$XAA" = xyes; then - XAA_TRUE= - XAA_FALSE='#' +$as_echo "#define GLXEXT 1" >>confdefs.h + + GLX_LIBS='$(top_builddir)/glx/libglx.la' + GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" else - XAA_TRUE='#' - XAA_FALSE= + GLX=no fi - - if test "x$VGAHW" = xyes; then - VGAHW_TRUE= - VGAHW_FALSE='#' + if test "x$GLX" = xyes; then + GLX_TRUE= + GLX_FALSE='#' else - VGAHW_TRUE='#' - VGAHW_FALSE= + GLX_TRUE='#' + GLX_FALSE= fi - if test "x$VBE" = xyes; then - VBE_TRUE= - VBE_FALSE='#' + +if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then + +$as_echo "#define AIGLX 1" >>confdefs.h + else - VBE_TRUE='#' - VBE_FALSE= + AIGLX=no fi - - if test "x$INT10MODULE" = xyes; then - INT10MODULE_TRUE= - INT10MODULE_FALSE='#' + if test "x$AIGLX" = xyes; then + AIGLX_TRUE= + AIGLX_FALSE='#' else - INT10MODULE_TRUE='#' - INT10MODULE_FALSE= + AIGLX_TRUE='#' + AIGLX_FALSE= fi +if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then + GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" + GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" +fi -cat >>confdefs.h <<\_ACEOF -#define SHAPE 1 -_ACEOF + if test "x$DRI" = xyes; then + DRI_TRUE= + DRI_FALSE='#' +else + DRI_TRUE='#' + DRI_FALSE= +fi +if test "x$DRI" = xyes; then - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$XKBPATH\"" - eval ac_define_dir="\"$ac_define_dir\"" - XKB_BASE_DIRECTORY="$ac_define_dir" +$as_echo "#define XF86DRI 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XKB_BASE_DIRECTORY "$ac_define_dir" -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRIPROTO" >&5 +$as_echo_n "checking for DRIPROTO... " >&6; } - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE +if test -n "$PKG_CONFIG"; then + if test -n "$DRIPROTO_CFLAGS"; then + pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRIPROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRIPROTO" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$DRIPROTO_LIBS"; then + pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRIPROTO_LIBS=`$PKG_CONFIG --libs "$DRIPROTO" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$bindir\"" - eval ac_define_dir="\"$ac_define_dir\"" - XKB_BIN_DIRECTORY="$ac_define_dir" +if test $pkg_failed = yes; then -cat >>confdefs.h <<_ACEOF -#define XKB_BIN_DIRECTORY "$ac_define_dir" -_ACEOF +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 + DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"` + else + DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRIPROTO_PKG_ERRORS" >&5 - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE + as_fn_error "Package requirements ($DRIPROTO) were not met: +$DRIPROTO_PKG_ERRORS -XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` -if [ x$XKBOUTPUT_FIRSTCHAR != x/ ] ; then - XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -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 DRIPROTO_CFLAGS +and DRIPROTO_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. -XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` -XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` +Alternatively, you may set the environment variables DRIPROTO_CFLAGS +and DRIPROTO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$XKBOUTPUT\"" - eval ac_define_dir="\"$ac_define_dir\"" - XKM_OUTPUT_DIR="$ac_define_dir" +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + DRIPROTO_CFLAGS=$pkg_cv_DRIPROTO_CFLAGS + DRIPROTO_LIBS=$pkg_cv_DRIPROTO_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 DRI" >&5 +$as_echo_n "checking for DRI... " >&6; } -cat >>confdefs.h <<_ACEOF -#define XKM_OUTPUT_DIR "$ac_define_dir" -_ACEOF +if test -n "$PKG_CONFIG"; then + if test -n "$DRI_CFLAGS"; then + pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBDRI" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$DRI_LIBS"; then + pkg_cv_DRI_LIBS="$DRI_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBDRI" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE +if test $pkg_failed = yes; then -if test "x$XKB_DFLT_RULES" = x; then - case $host_os in - linux*) - if test "x$CONFIG_HAL" = xyes; then - XKB_DFLT_RULES="evdev" +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 + DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` else - XKB_DFLT_RULES="base" + DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` fi - ;; - *) - XKB_DFLT_RULES="base" - ;; - esac -fi + # Put the nasty error message in config.log where it belongs + echo "$DRI_PKG_ERRORS" >&5 -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_RULES "$XKB_DFLT_RULES" -_ACEOF + as_fn_error "Package requirements ($GLPROTO $LIBDRI) were not met: +$DRI_PKG_ERRORS -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_MODEL "$XKB_DFLT_MODEL" -_ACEOF +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables DRI_CFLAGS +and DRI_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. -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_LAYOUT "$XKB_DFLT_LAYOUT" -_ACEOF +Alternatively, you may set the environment variables DRI_CFLAGS +and DRI_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + DRI_CFLAGS=$pkg_cv_DRI_CFLAGS + DRI_LIBS=$pkg_cv_DRI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_VARIANT "$XKB_DFLT_VARIANT" -_ACEOF +fi -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_OPTIONS "$XKB_DFLT_OPTIONS" -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI2PROTO" >&5 +$as_echo_n "checking for DRI2PROTO... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$DRI2PROTO_CFLAGS"; then + pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$DRI2PROTO_LIBS"; then + pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + -XKB_LIB='$(top_builddir)/xkb/libxkb.la' -XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +if test $pkg_failed = yes; then -{ $as_echo "$as_me:$LINENO: checking for strcasecmp" >&5 -$as_echo_n "checking for strcasecmp... " >&6; } -if test "${ac_cv_func_strcasecmp+set}" = set; then - $as_echo_n "(cached) " >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define strcasecmp to an innocuous variant, in case declares strcasecmp. - For example, HP-UX 11i declares gettimeofday. */ -#define strcasecmp innocuous_strcasecmp + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"` + else + DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRI2PROTO_PKG_ERRORS" >&5 -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strcasecmp (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_DRI2PROTO=no +elif test $pkg_failed = untried; then + HAVE_DRI2PROTO=no +else + DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS + DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_DRI2PROTO=yes +fi +case "$DRI2,$HAVE_DRI2PROTO" in + yes,no) + as_fn_error "DRI2 requested, but dri2proto not found." "$LINENO" 5 + ;; + yes,yes | auto,yes) -#ifdef __STDC__ -# include -#else -# include -#endif +$as_echo "#define DRI2 1" >>confdefs.h -#undef strcasecmp + DRI2=yes + ;; +esac + if test "x$DRI2" = xyes; then + DRI2_TRUE= + DRI2_FALSE='#' +else + DRI2_TRUE='#' + DRI2_FALSE= +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 strcasecmp (); -/* 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_strcasecmp || defined __stub___strcasecmp -choke me -#endif -int -main () -{ -return strcasecmp (); - ; - 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 test "x$DRI" = xyes || test "x$DRI2" = xyes; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM" >&5 +$as_echo_n "checking for LIBDRM... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBDRM_CFLAGS"; then + pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDRM") 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_func_strcasecmp=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strcasecmp=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 + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5 -$as_echo "$ac_cv_func_strcasecmp" >&6; } -if test "x$ac_cv_func_strcasecmp" = x""yes; then - : +if test -n "$PKG_CONFIG"; then + if test -n "$LIBDRM_LIBS"; then + pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null` else - -cat >>confdefs.h <<\_ACEOF -#define NEED_STRCASECMP 1 -_ACEOF - + pkg_failed=yes fi - -{ $as_echo "$as_me:$LINENO: checking for strncasecmp" >&5 -$as_echo_n "checking for strncasecmp... " >&6; } -if test "${ac_cv_func_strncasecmp+set}" = set; then - $as_echo_n "(cached) " >&6 + fi else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define strncasecmp to an innocuous variant, in case declares strncasecmp. - For example, HP-UX 11i declares gettimeofday. */ -#define strncasecmp innocuous_strncasecmp - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strncasecmp (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + pkg_failed=untried +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef strncasecmp -/* 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 strncasecmp (); -/* 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_strncasecmp || defined __stub___strncasecmp -choke me -#endif +if test $pkg_failed = yes; then -int -main () -{ -return strncasecmp (); - ; - 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_strncasecmp=yes +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strncasecmp=no + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"` + else + LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBDRM_PKG_ERRORS" >&5 -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_strncasecmp" >&5 -$as_echo "$ac_cv_func_strncasecmp" >&6; } -if test "x$ac_cv_func_strncasecmp" = x""yes; then - : -else + as_fn_error "Package requirements ($LIBDRM) were not met: -cat >>confdefs.h <<\_ACEOF -#define NEED_STRNCASECMP 1 -_ACEOF +$LIBDRM_PKG_ERRORS -fi +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -{ $as_echo "$as_me:$LINENO: checking for strcasestr" >&5 -$as_echo_n "checking for strcasestr... " >&6; } -if test "${ac_cv_func_strcasestr+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 strcasestr to an innocuous variant, in case declares strcasestr. - For example, HP-UX 11i declares gettimeofday. */ -#define strcasestr innocuous_strcasestr +Alternatively, you may set the environment variables LIBDRM_CFLAGS +and LIBDRM_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. -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strcasestr (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +Alternatively, you may set the environment variables LIBDRM_CFLAGS +and LIBDRM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -#ifdef __STDC__ -# include -#else -# include -#endif +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS + LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi -#undef strcasestr -/* 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 strcasestr (); -/* 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_strcasestr || defined __stub___strcasestr -choke me -#endif +fi -int -main () -{ -return strcasestr (); - ; - return 0; -} +if test "x$DRI2" = xyes; then + save_CFLAGS=$CFLAGS + CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#ifndef __DRI_DRI2 +#error DRI2 extension not available. +#endif _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_strcasestr=yes +if ac_fn_c_try_compile "$LINENO"; then : + HAVE_DRI2EXTENSION=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + HAVE_DRI2EXTENSION=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$save_CFLAGS + if test "x$HAVE_DRI2EXTENSION" = xyes; then + +$as_echo "#define DRI2_AIGLX 1" >>confdefs.h - ac_cv_func_strcasestr=no + DRI2_AIGLX=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5 +$as_echo "$as_me: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&6;} + DRI2_AIGLX=no + fi +fi + if test "x$DRI2_AIGLX" = xyes; then + DRI2_AIGLX_TRUE= + DRI2_AIGLX_FALSE='#' +else + DRI2_AIGLX_TRUE='#' + DRI2_AIGLX_FALSE= 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_strcasestr" >&5 -$as_echo "$ac_cv_func_strcasestr" >&6; } -if test "x$ac_cv_func_strcasestr" = x""yes; then - : -else -cat >>confdefs.h <<\_ACEOF -#define NEED_STRCASESTR 1 -_ACEOF + if test "x$XINERAMA" = xyes; then + XINERAMA_TRUE= + XINERAMA_FALSE='#' +else + XINERAMA_TRUE='#' + XINERAMA_FALSE= fi +if test "x$XINERAMA" = xyes; then -if test "x$NULL_ROOT_CURSOR" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define NULL_ROOT_CURSOR 1 -_ACEOF - -fi +$as_echo "#define XINERAMA 1" >>confdefs.h -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XDMCP" >&5 -$as_echo_n "checking for XDMCP... " >&6; } +$as_echo "#define PANORAMIX 1" >>confdefs.h -if test -n "$XDMCP_CFLAGS"; then - pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 - ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried + REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" fi -if test -n "$XDMCP_LIBS"; then - pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 - ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null` + + if test "x$XACE" = xyes; then + XACE_TRUE= + XACE_FALSE='#' else - pkg_failed=yes -fi - else - pkg_failed=untried + XACE_TRUE='#' + XACE_FALSE= fi +if test "x$XACE" = xyes; then +$as_echo "#define XACE 1" >>confdefs.h -if test $pkg_failed = yes; then +fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "x$XSELINUX" = xyes; then + XSELINUX_TRUE= + XSELINUX_FALSE='#' else - _pkg_short_errors_supported=no + XSELINUX_TRUE='#' + XSELINUX_FALSE= fi - if test $_pkg_short_errors_supported = yes; then - XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1` - else - XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XDMCP_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - have_libxdmcp="no" -elif test $pkg_failed = untried; then - have_libxdmcp="no" +if test "x$XSELINUX" = xyes; then + if test "x$XACE" != xyes; then + as_fn_error "cannot build SELinux extension without X-ACE" "$LINENO" 5 + fi + for ac_header in selinux/selinux.h selinux/avc.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 + else - XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS - XDMCP_LIBS=$pkg_cv_XDMCP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - have_libxdmcp="yes" + as_fn_error "SELinux include files not found" "$LINENO" 5 fi -if test "x$have_libxdmcp" = xyes; then - { $as_echo "$as_me:$LINENO: checking for XdmcpWrap in -lXdmcp" >&5 -$as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; } -if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avc_init in -lselinux" >&5 +$as_echo_n "checking for avc_init in -lselinux... " >&6; } +if test "${ac_cv_lib_selinux_avc_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXdmcp $XDMCP_LIBS $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. @@ -24223,611 +17578,509 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char XdmcpWrap (); +char avc_init (); int main () { -return XdmcpWrap (); +return avc_init (); ; 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_Xdmcp_XdmcpWrap=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_selinux_avc_init=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xdmcp_XdmcpWrap=no + ac_cv_lib_selinux_avc_init=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_Xdmcp_XdmcpWrap" >&5 -$as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; } -if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then - have_xdmcpwrap="yes" -else - have_xdmcpwrap="no" -fi - -fi -if test "x$XDMCP" = xauto; then - if test "x$have_libxdmcp" = xyes; then - XDMCP=yes - else - XDMCP=no - fi -fi -if test "x$XDMAUTH" = xauto; then - if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then - XDMAUTH=yes - else - XDMAUTH=no - fi -fi - - if test "x$XDMCP" = xyes; then - XDMCP_TRUE= - XDMCP_FALSE='#' -else - XDMCP_TRUE='#' - XDMCP_FALSE= -fi - -if test "x$XDMCP" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define XDMCP 1 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_avc_init" >&5 +$as_echo "$ac_cv_lib_selinux_avc_init" >&6; } +if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSELINUX 1 _ACEOF - REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" - XDMCP_MODULES="xdmcp" -fi + LIBS="-lselinux $LIBS" - if test "x$XDMAUTH" = xyes; then - XDMAUTH_TRUE= - XDMAUTH_FALSE='#' else - XDMAUTH_TRUE='#' - XDMAUTH_FALSE= + as_fn_error "SELinux library not found" "$LINENO" 5 fi -if test "x$XDMAUTH" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HASXDMAUTH 1 + for ac_header in libaudit.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default" +if test "x$ac_cv_header_libaudit_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAUDIT_H 1 _ACEOF - if ! test "x$XDMCP" = xyes; then - REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" - XDMCP_MODULES="xdmcp" - fi +else + as_fn_error "SELinux extension requires audit system headers" "$LINENO" 5 fi +done - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$FONTPATH\"" - eval ac_define_dir="\"$ac_define_dir\"" - COMPILEDDEFAULTFONTPATH="$ac_define_dir" - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5 +$as_echo_n "checking for audit_open in -laudit... " >&6; } +if test "${ac_cv_lib_audit_audit_open+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-laudit $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<_ACEOF -#define COMPILEDDEFAULTFONTPATH "$ac_define_dir" +/* 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 audit_open (); +int +main () +{ +return audit_open (); + ; + return 0; +} _ACEOF - - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE - - - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$PCI_TXT_IDS_DIR\"" - eval ac_define_dir="\"$ac_define_dir\"" - PCI_TXT_IDS_PATH="$ac_define_dir" - - -cat >>confdefs.h <<_ACEOF -#define PCI_TXT_IDS_PATH "$ac_define_dir" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_audit_audit_open=yes +else + ac_cv_lib_audit_audit_open=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_audit_audit_open" >&5 +$as_echo "$ac_cv_lib_audit_audit_open" >&6; } +if test "x$ac_cv_lib_audit_audit_open" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAUDIT 1 _ACEOF - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE - - - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$SERVERCONFIG\"" - eval ac_define_dir="\"$ac_define_dir\"" - SERVER_MISC_CONFIG_PATH="$ac_define_dir" - - -cat >>confdefs.h <<_ACEOF -#define SERVER_MISC_CONFIG_PATH "$ac_define_dir" -_ACEOF + LIBS="-laudit $LIBS" - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE +else + as_fn_error "SELinux extension requires audit system library" "$LINENO" 5 +fi + ac_fn_c_check_decl "$LINENO" "avc_netlink_acquire_fd" "ac_cv_have_decl_avc_netlink_acquire_fd" "#include +" +if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then : - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$FONTDIR\"" - eval ac_define_dir="\"$ac_define_dir\"" - BASE_FONT_PATH="$ac_define_dir" +$as_echo "#define HAVE_AVC_NETLINK_ACQUIRE_FD 1" >>confdefs.h +fi -cat >>confdefs.h <<_ACEOF -#define BASE_FONT_PATH "$ac_define_dir" -_ACEOF - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE +$as_echo "#define XSELINUX 1" >>confdefs.h + SELINUX_LIB="-lselinux -laudit" +fi - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$DRI_DRIVER_PATH\"" - eval ac_define_dir="\"$ac_define_dir\"" - DRI_DRIVER_PATH="$ac_define_dir" + if test "x$XCSECURITY" = xyes; then + XCSECURITY_TRUE= + XCSECURITY_FALSE='#' +else + XCSECURITY_TRUE='#' + XCSECURITY_FALSE= +fi +if test "x$XCSECURITY" = xyes; then + if test "x$XACE" != xyes; then + as_fn_error "cannot build Security extension without X-ACE" "$LINENO" 5 + fi -cat >>confdefs.h <<_ACEOF -#define DRI_DRIVER_PATH "$ac_define_dir" -_ACEOF +$as_echo "#define XCSECURITY 1" >>confdefs.h - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE +fi + if test "x$MULTIBUFFER" = xyes; then + MULTIBUFFER_TRUE= + MULTIBUFFER_FALSE='#' +else + MULTIBUFFER_TRUE='#' + MULTIBUFFER_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define XVENDORNAME "$VENDOR_NAME" -_ACEOF +if test "x$MULTIBUFFER" = xyes; then +$as_echo "#define MULTIBUFFER 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XVENDORNAMESHORT "$VENDOR_NAME_SHORT" -_ACEOF + # Requires xextproto which is always required +fi + if test "x$DBE" = xyes; then + DBE_TRUE= + DBE_FALSE='#' +else + DBE_TRUE='#' + DBE_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define XORG_DATE "$RELEASE_DATE" -_ACEOF +if test "x$DBE" = xyes; then +$as_echo "#define DBE 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XORG_MAN_VERSION "$VENDOR_MAN_VERSION" -_ACEOF + DBE_LIB='$(top_builddir)/dbe/libdbe.la' +fi + if test "x$XF86BIGFONT" = xyes; then + XF86BIGFONT_TRUE= + XF86BIGFONT_FALSE='#' +else + XF86BIGFONT_TRUE='#' + XF86BIGFONT_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define BUILDERADDR "$BUILDERADDR" -_ACEOF +if test "x$XF86BIGFONT" = xyes; then +$as_echo "#define XF86BIGFONT 1" >>confdefs.h -if test -z "$OSNAME"; then - OSNAME="UNKNOWN" + REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" fi + if test "x$DPMSExtension" = xyes; then + DPMSExtension_TRUE= + DPMSExtension_FALSE='#' +else + DPMSExtension_TRUE='#' + DPMSExtension_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define OSNAME "$OSNAME" -_ACEOF - +if test "x$DPMSExtension" = xyes; then -cat >>confdefs.h <<_ACEOF -#define OSVENDOR "$OSVENDOR" -_ACEOF +$as_echo "#define DPMSExtension 1" >>confdefs.h +fi -cat >>confdefs.h <<_ACEOF -#define BUILDERSTRING "$BUILDERSTRING" -_ACEOF +if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then +$as_echo "#define XCALIBRATE 1" >>confdefs.h + REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO" +else + XCALIBRATE=no +fi + if test "x$XCALIBRATE" = xyes; then + XCALIBRATE_TRUE= + XCALIBRATE_FALSE='#' +else + XCALIBRATE_TRUE='#' + XCALIBRATE_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define VENDOR_NAME "$VENDOR_NAME" -_ACEOF +$as_echo "#define RENDER 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VENDOR_NAME_SHORT "$VENDOR_NAME_SHORT" -_ACEOF +RENDER_LIB='$(top_builddir)/render/librender.la' +RENDER_INC='-I$(top_srcdir)/render' -cat >>confdefs.h <<_ACEOF -#define VENDOR_RELEASE $VENDOR_RELEASE -_ACEOF +$as_echo "#define RANDR 1" >>confdefs.h +RANDR_LIB='$(top_builddir)/randr/librandr.la' +RANDR_INC='-I$(top_srcdir)/randr' -cat >>confdefs.h <<_ACEOF -#define VENDOR_MAN_VERSION "$VENDOR_MAN_VERSION" -_ACEOF +$as_echo "#define XFIXES 1" >>confdefs.h +FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' +FIXES_INC='-I$(top_srcdir)/xfixes' -cat >>confdefs.h <<\_ACEOF -#define NO_LIBCWRAPPER 1 -_ACEOF +$as_echo "#define DAMAGE 1" >>confdefs.h -if test "x$DEBUGGING" = xyes; then +DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' +DAMAGE_INC='-I$(top_srcdir)/damageext' +MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' +MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' -cat >>confdefs.h <<\_ACEOF -#define DEBUG 1 -_ACEOF +# XINPUT extension is integral part of the server +XI_LIB='$(top_builddir)/Xi/libXi.la' +XI_INC='-I$(top_srcdir)/Xi' -fi - if test "x$DEBUGGING" = xyes; then - DEBUG_TRUE= - DEBUG_FALSE='#' + if test "x$XF86UTILS" = xyes; then + XF86UTILS_TRUE= + XF86UTILS_FALSE='#' else - DEBUG_TRUE='#' - DEBUG_FALSE= + XF86UTILS_TRUE='#' + XF86UTILS_FALSE= fi - -# If unittests aren't explicitly disabled, check for required support -if test "x$UNITTESTS" != xno ; then - -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } - -if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$LIBGLIB" 2>/dev/null` + if test "x$XAA" = xyes; then + XAA_TRUE= + XAA_FALSE='#' else - pkg_failed=yes + XAA_TRUE='#' + XAA_FALSE= fi - else - pkg_failed=untried + + if test "x$VGAHW" = xyes; then + VGAHW_TRUE= + VGAHW_FALSE='#' +else + VGAHW_TRUE='#' + VGAHW_FALSE= fi -if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$LIBGLIB" 2>/dev/null` + + if test "x$VBE" = xyes; then + VBE_TRUE= + VBE_FALSE='#' else - pkg_failed=yes + VBE_TRUE='#' + VBE_FALSE= fi - else - pkg_failed=untried + + if test "x$INT10MODULE" = xyes; then + INT10MODULE_TRUE= + INT10MODULE_FALSE='#' +else + INT10MODULE_TRUE='#' + INT10MODULE_FALSE= fi -if test $pkg_failed = yes; then +$as_echo "#define SHAPE 1" >>confdefs.h -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 - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - HAVE_GLIB=no -elif test $pkg_failed = untried; then - HAVE_GLIB=no + + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$XKBPATH\"" + eval ac_define_dir="\"$ac_define_dir\"" + XKB_BASE_DIRECTORY="$ac_define_dir" + + +cat >>confdefs.h <<_ACEOF +#define XKB_BASE_DIRECTORY "$ac_define_dir" +_ACEOF + + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE + + +# Check whether --with-xkb-bin-directory was given. +if test "${with_xkb_bin_directory+set}" = set; then : + withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval" else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_GLIB=yes + XKB_BIN_DIRECTORY="$bindir" fi - # Check if linker supports -wrap, passed via compiler flags - # When cross-compiling, reports no, since unit tests run from - # "make check", so would be running on build machine, not target - { $as_echo "$as_me:$LINENO: checking whether the linker supports -wrap" >&5 -$as_echo_n "checking whether the linker supports -wrap... " >&6; } - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,-wrap,exit" - if test "$cross_compiling" = yes; then - linker_can_wrap="no" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - void __wrap_exit (int s) - { - __real_exit (0); - } -int -main () -{ -exit (1); - ; - return 0; -} + + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$XKB_BIN_DIRECTORY\"" + eval ac_define_dir="\"$ac_define_dir\"" + XKB_BIN_DIRECTORY="$ac_define_dir" + + +cat >>confdefs.h <<_ACEOF +#define XKB_BIN_DIRECTORY "$ac_define_dir" _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 - linker_can_wrap="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 ) -linker_can_wrap="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 + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE + + +XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` +if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then + XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" fi - { $as_echo "$as_me:$LINENO: result: $linker_can_wrap" >&5 -$as_echo "$linker_can_wrap" >&6; } - LDFLAGS="$save_LDFLAGS" -fi +XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` +XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` + + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$XKBOUTPUT\"" + eval ac_define_dir="\"$ac_define_dir\"" + XKM_OUTPUT_DIR="$ac_define_dir" -if test "x$UNITTESTS" = xauto; then - if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then - UNITTESTS=yes - else - UNITTESTS=no - fi -fi -if test "x$UNITTESTS" = xyes; then - if test "x$HAVE_GLIB" = xno; then - { { $as_echo "$as_me:$LINENO: error: glib required to build unit tests" >&5 -$as_echo "$as_me: error: glib required to build unit tests" >&2;} - { (exit 1); exit 1; }; } - fi - if test "x$linker_can_wrap" = xno; then - { { $as_echo "$as_me:$LINENO: error: ld -wrap support required to build unit tests" >&5 -$as_echo "$as_me: error: ld -wrap support required to build unit tests" >&2;} - { (exit 1); exit 1; }; } - fi -cat >>confdefs.h <<\_ACEOF -#define UNITTESTS 1 +cat >>confdefs.h <<_ACEOF +#define XKM_OUTPUT_DIR "$ac_define_dir" _ACEOF + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -fi - if test "x$UNITTESTS" = xyes; then - UNITTESTS_TRUE= - UNITTESTS_FALSE='#' -else - UNITTESTS_TRUE='#' - UNITTESTS_FALSE= + +if test "x$XKB_DFLT_RULES" = x; then + case $host_os in + linux*) + if test "x$CONFIG_HAL" = xyes; then + XKB_DFLT_RULES="evdev" + else + XKB_DFLT_RULES="base" + fi + ;; + *) + XKB_DFLT_RULES="base" + ;; + esac fi +cat >>confdefs.h <<_ACEOF +#define XKB_DFLT_RULES "$XKB_DFLT_RULES" +_ACEOF -cat >>confdefs.h <<\_ACEOF -#define XTEST 1 +cat >>confdefs.h <<_ACEOF +#define XKB_DFLT_MODEL "$XKB_DFLT_MODEL" _ACEOF -cat >>confdefs.h <<\_ACEOF -#define XSYNC 1 +cat >>confdefs.h <<_ACEOF +#define XKB_DFLT_LAYOUT "$XKB_DFLT_LAYOUT" _ACEOF -cat >>confdefs.h <<\_ACEOF -#define XCMISC 1 +cat >>confdefs.h <<_ACEOF +#define XKB_DFLT_VARIANT "$XKB_DFLT_VARIANT" _ACEOF -cat >>confdefs.h <<\_ACEOF -#define BIGREQS 1 +cat >>confdefs.h <<_ACEOF +#define XKB_DFLT_OPTIONS "$XKB_DFLT_OPTIONS" _ACEOF -if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then - DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O' +XKB_LIB='$(top_builddir)/xkb/libxkb.la' +XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' +REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" + +ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = x""yes; then : + else - DIX_LIB='$(top_builddir)/dix/libdix.la' - OS_LIB='$(top_builddir)/os/libos.la' + +$as_echo "#define NEED_STRCASECMP 1" >>confdefs.h + fi +ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = x""yes; then : +else -MAIN_LIB='$(top_builddir)/dix/libmain.la' +$as_echo "#define NEED_STRNCASECMP 1" >>confdefs.h +fi -MI_LIB='$(top_builddir)/mi/libmi.la' -MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' -MI_INC='-I$(top_srcdir)/mi' -FB_LIB='$(top_builddir)/fb/libfb.la' -FB_INC='-I$(top_srcdir)/fb' -MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' -MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' -CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' +ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" +if test "x$ac_cv_func_strcasestr" = x""yes; then : -# OpenSSL used for SHA1 hashing in render/glyph.c, but we don't need all of -# the OpenSSL libraries, just libcrypto -# Some systems have matching functionality in the smaller/simpler libmd -# Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS -if test "x$SHA1_LIB" = "x" ; then - { $as_echo "$as_me:$LINENO: checking for SHA1Init in -lmd" >&5 -$as_echo_n "checking for SHA1Init in -lmd... " >&6; } -if test "${ac_cv_lib_md_SHA1Init+set}" = set; then - $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmd $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 SHA1Init (); -int -main () -{ -return SHA1Init (); - ; - 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_md_SHA1Init=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define NEED_STRCASESTR 1" >>confdefs.h - ac_cv_lib_md_SHA1Init=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 + +if test "x$NULL_ROOT_CURSOR" = xyes; then + +$as_echo "#define NULL_ROOT_CURSOR 1" >>confdefs.h + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_md_SHA1Init" >&5 -$as_echo "$ac_cv_lib_md_SHA1Init" >&6; } -if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then - SHA1_LIB="-lmd" -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHA1_IN_LIBMD 1 -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5 +$as_echo_n "checking for XDMCP... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XDMCP_CFLAGS"; then + pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XDMCP_LIBS"; then + pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 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 + XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` + else + XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XDMCP_PKG_ERRORS" >&5 -if test "x$SHA1_LIB" = "x" ; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OPENSSL\"") >&5 - ($PKG_CONFIG --exists --print-errors "OPENSSL") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - openssl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libxdmcp="no" +elif test $pkg_failed = untried; then + have_libxdmcp="no" else - HAVE_OPENSSL_PKC=yes + XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS + XDMCP_LIBS=$pkg_cv_XDMCP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libxdmcp="yes" fi - if test "x$HAVE_OPENSSL_PKC" = xyes; then - REQUIRED_LIBS="$REQUIRED_LIBS openssl" - else - { $as_echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5 -$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then +if test "x$have_libxdmcp" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpWrap in -lXdmcp" >&5 +$as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; } +if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lXdmcp $XDMCP_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -24836,505 +18089,295 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char SHA1_Init (); +char XdmcpWrap (); int main () { -return SHA1_Init (); +return XdmcpWrap (); ; 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_crypto_SHA1_Init=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xdmcp_XdmcpWrap=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_crypto_SHA1_Init=no + ac_cv_lib_Xdmcp_XdmcpWrap=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_crypto_SHA1_Init" >&5 -$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; } -if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then - SHA1_LIB="-lcrypto" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5 +$as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; } +if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then : + have_xdmcpwrap="yes" else - { { $as_echo "$as_me:$LINENO: error: OpenSSL must be installed in order to build the X server." >&5 -$as_echo "$as_me: error: OpenSSL must be installed in order to build the X server." >&2;} - { (exit 1); exit 1; }; } + have_xdmcpwrap="no" fi - fi fi - - -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5 -$as_echo_n "checking for XSERVERCFLAGS... " >&6; } - -if test -n "$XSERVERCFLAGS_CFLAGS"; then - pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` -else - pkg_failed=yes +if test "x$XDMCP" = xauto; then + if test "x$have_libxdmcp" = xyes; then + XDMCP=yes + else + XDMCP=no + fi fi - else - pkg_failed=untried +if test "x$XDMAUTH" = xauto; then + if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then + XDMAUTH=yes + else + XDMAUTH=no + fi fi -if test -n "$XSERVERCFLAGS_LIBS"; then - pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` + + if test "x$XDMCP" = xyes; then + XDMCP_TRUE= + XDMCP_FALSE='#' else - pkg_failed=yes -fi - else - pkg_failed=untried + XDMCP_TRUE='#' + XDMCP_FALSE= fi +if test "x$XDMCP" = xyes; then +$as_echo "#define XDMCP 1" >>confdefs.h -if test $pkg_failed = yes; then + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" + XDMCP_MODULES="xdmcp" +fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "x$XDMAUTH" = xyes; then + XDMAUTH_TRUE= + XDMAUTH_FALSE='#' else - _pkg_short_errors_supported=no + XDMAUTH_TRUE='#' + XDMAUTH_FALSE= fi - if test $_pkg_short_errors_supported = yes; then - XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` - else - XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: - -$XSERVERCFLAGS_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +if test "x$XDMAUTH" = xyes; then -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_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 ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: +$as_echo "#define HASXDMAUTH 1" >>confdefs.h -$XSERVERCFLAGS_PKG_ERRORS + if ! test "x$XDMCP" = xyes; then + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" + XDMCP_MODULES="xdmcp" + fi +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 XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_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. + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$FONTPATH\"" + eval ac_define_dir="\"$ac_define_dir\"" + COMPILEDDEFAULTFONTPATH="$ac_define_dir" -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +cat >>confdefs.h <<_ACEOF +#define COMPILEDDEFAULTFONTPATH "$ac_define_dir" +_ACEOF -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -else - XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS - XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5 -$as_echo_n "checking for XSERVERLIBS... " >&6; } + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$PCI_TXT_IDS_DIR\"" + eval ac_define_dir="\"$ac_define_dir\"" + PCI_TXT_IDS_PATH="$ac_define_dir" -if test -n "$XSERVERLIBS_CFLAGS"; then - pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$XSERVERLIBS_LIBS"; then - pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi +cat >>confdefs.h <<_ACEOF +#define PCI_TXT_IDS_PATH "$ac_define_dir" +_ACEOF + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -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 - XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1` - else - XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XSERVERLIBS_PKG_ERRORS" >&5 + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$SERVERCONFIG\"" + eval ac_define_dir="\"$ac_define_dir\"" + SERVER_MISC_CONFIG_PATH="$ac_define_dir" - { { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_LIBS) were not met: -$XSERVERLIBS_PKG_ERRORS +cat >>confdefs.h <<_ACEOF +#define SERVER_MISC_CONFIG_PATH "$ac_define_dir" +_ACEOF -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_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 ($REQUIRED_LIBS) were not met: -$XSERVERLIBS_PKG_ERRORS + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$FONTDIR\"" + eval ac_define_dir="\"$ac_define_dir\"" + BASE_FONT_PATH="$ac_define_dir" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_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. +cat >>confdefs.h <<_ACEOF +#define BASE_FONT_PATH "$ac_define_dir" +_ACEOF -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -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 XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$DRI_DRIVER_PATH\"" + eval ac_define_dir="\"$ac_define_dir\"" + DRI_DRIVER_PATH="$ac_define_dir" -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -else - XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS - XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi -# Autotools has some unfortunate issues with library handling. In order to -# get a server to rebuild when a dependency in the tree is changed, it must -# be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be -# listed there, or some versions of autotools will break (especially if a -L -# is required to find the library). So, we keep two sets of libraries -# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which -# will go into the _DEPENDENCIES and _LDADD of the server, and -# NAMESPACE_SYS_LIBS which will go into only the _LDADD. The -# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in -# NAMESPACE_SYS_LIBS. -# -# XSERVER_LIBS is the set of in-tree libraries which all servers require. -# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers -# require. -# -XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" -XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" -XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" +cat >>confdefs.h <<_ACEOF +#define DRI_DRIVER_PATH "$ac_define_dir" +_ACEOF + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE -UTILS_SYS_LIBS="${SYS_LIBS}" +cat >>confdefs.h <<_ACEOF +#define XVENDORNAME "$VENDOR_NAME" +_ACEOF -# The Xorg binary needs to export symbols so that they can be used from modules -# Some platforms require extra flags to do this. gcc should set these flags -# when -rdynamic is passed to it, other compilers/linkers may need to be added -# here. +cat >>confdefs.h <<_ACEOF +#define XVENDORNAMESHORT "$VENDOR_NAME_SHORT" +_ACEOF -if test "x$GCC" = xyes ; then - CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ --Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast" - case `$CC -dumpversion` in - 3.4.* | 4.*) - CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" - ;; - esac -else - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define XORG_DATE "$RELEASE_DATE" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - ; - return 0; -} + +cat >>confdefs.h <<_ACEOF +#define XORG_MAN_VERSION "$VENDOR_MAN_VERSION" _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_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl___SUNPRO_C=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then - SUNCC="yes" -else - SUNCC="no" -fi +cat >>confdefs.h <<_ACEOF +#define BUILDERADDR "$BUILDERADDR" +_ACEOF - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - fi -fi -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then - enableval=$enable_silent_rules; +if test -z "$OSNAME"; then + OSNAME="UNKNOWN" fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; -esac -AM_BACKSLASH='\' +cat >>confdefs.h <<_ACEOF +#define OSNAME "$OSNAME" +_ACEOF -if test "x$GCC" = "xyes"; then - if test "x$WERROR" = "xyes"; then - CWARNFLAGS="${CWARNFLAGS} -Werror" - fi - LD_EXPORT_SYMBOLS_FLAG="-rdynamic" -fi -XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS" -case $host_os in - openbsd*) - LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" - ;; -esac + +cat >>confdefs.h <<_ACEOF +#define OSVENDOR "$OSVENDOR" +_ACEOF -{ $as_echo "$as_me:$LINENO: checking if SVR4 needs to be defined" >&5 -$as_echo_n "checking if SVR4 needs to be defined... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define BUILDERSTRING "$BUILDERSTRING" _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) - I_AM_SVR4 -#endif + + +cat >>confdefs.h <<_ACEOF +#define VENDOR_NAME "$VENDOR_NAME" _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I_AM_SVR4" >/dev/null 2>&1; then -cat >>confdefs.h <<\_ACEOF -#define SVR4 1 +cat >>confdefs.h <<_ACEOF +#define VENDOR_NAME_SHORT "$VENDOR_NAME_SHORT" _ACEOF -{ $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; } -fi -rm -f conftest* + +cat >>confdefs.h <<_ACEOF +#define VENDOR_RELEASE $VENDOR_RELEASE +_ACEOF -XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC" +cat >>confdefs.h <<_ACEOF +#define VENDOR_MAN_VERSION "$VENDOR_MAN_VERSION" +_ACEOF -{ $as_echo "$as_me:$LINENO: checking whether to build Xvfb DDX" >&5 -$as_echo_n "checking whether to build Xvfb DDX... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $XVFB" >&5 -$as_echo "$XVFB" >&6; } - if test "x$XVFB" = xyes; then - XVFB_TRUE= - XVFB_FALSE='#' -else - XVFB_TRUE='#' - XVFB_FALSE= -fi +$as_echo "#define NO_LIBCWRAPPER 1" >>confdefs.h -if test "x$XVFB" = xyes; then - XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" - XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" +if test "x$DEBUGGING" = xyes; then +$as_echo "#define DEBUG 1" >>confdefs.h +fi + if test "x$DEBUGGING" = xyes; then + DEBUG_TRUE= + DEBUG_FALSE='#' +else + DEBUG_TRUE='#' + DEBUG_FALSE= fi - +# If unittests aren't explicitly disabled, check for required support +if test "x$UNITTESTS" != xno ; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XNESTMODULES" >&5 -$as_echo_n "checking for XNESTMODULES... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } -if test -n "$XNESTMODULES_CFLAGS"; then - pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$LIBGLIB" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XNESTMODULES_LIBS"; then - pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$LIBGLIB" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -25347,248 +18390,278 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"` else - XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"` fi # Put the nasty error message in config.log where it belongs - echo "$XNESTMODULES_PKG_ERRORS" >&5 + echo "$GLIB_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_xnest=no + HAVE_GLIB=no elif test $pkg_failed = untried; then - have_xnest=no + HAVE_GLIB=no else - XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS - XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_xnest=yes -fi -{ $as_echo "$as_me:$LINENO: checking whether to build Xnest DDX" >&5 -$as_echo_n "checking whether to build Xnest DDX... " >&6; } -if test "x$XNEST" = xauto; then - XNEST="$have_xnest" + HAVE_GLIB=yes fi -{ $as_echo "$as_me:$LINENO: result: $XNEST" >&5 -$as_echo "$XNEST" >&6; } - if test "x$XNEST" = xyes; then - XNEST_TRUE= - XNEST_FALSE='#' + + # Check if linker supports -wrap, passed via compiler flags + # When cross-compiling, reports no, since unit tests run from + # "make check", so would be running on build machine, not target + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports -wrap" >&5 +$as_echo_n "checking whether the linker supports -wrap... " >&6; } + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,-wrap,exit" + if test "$cross_compiling" = yes; then : + linker_can_wrap="no" else - XNEST_TRUE='#' - XNEST_FALSE= + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void __wrap_exit (int s) + { + __real_exit (0); + } +int +main () +{ +exit (1); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + linker_can_wrap="yes" +else + linker_can_wrap="no" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $linker_can_wrap" >&5 +$as_echo "$linker_can_wrap" >&6; } + LDFLAGS="$save_LDFLAGS" +fi + +if test "x$UNITTESTS" = xauto; then + if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then + UNITTESTS=yes + else + UNITTESTS=no + fi +fi +if test "x$UNITTESTS" = xyes; then + if test "x$HAVE_GLIB" = xno; then + as_fn_error "glib required to build unit tests" "$LINENO" 5 + fi + if test "x$linker_can_wrap" = xno; then + as_fn_error "ld -wrap support required to build unit tests" "$LINENO" 5 + fi + +$as_echo "#define UNITTESTS 1" >>confdefs.h -if test "x$XNEST" = xyes; then - if test "x$have_xnest" = xno; then - { { $as_echo "$as_me:$LINENO: error: Xnest build explicitly requested, but required modules not found." >&5 -$as_echo "$as_me: error: Xnest build explicitly requested, but required modules not found." >&2;} - { (exit 1); exit 1; }; } - fi - XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB" - XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" +fi + if test "x$UNITTESTS" = xyes; then + UNITTESTS_TRUE= + UNITTESTS_FALSE='#' +else + UNITTESTS_TRUE='#' + UNITTESTS_FALSE= fi -{ $as_echo "$as_me:$LINENO: checking whether to build Xorg DDX" >&5 -$as_echo_n "checking whether to build Xorg DDX... " >&6; } -if test "x$XORG" = xauto; then - XORG="yes" - case $host_os in - cygwin*) XORG="no" ;; - darwin*) XORG="no" ;; - esac +$as_echo "#define XTEST 1" >>confdefs.h + + +$as_echo "#define XSYNC 1" >>confdefs.h + + +$as_echo "#define XCMISC 1" >>confdefs.h + + +$as_echo "#define BIGREQS 1" >>confdefs.h + + +if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then + DIX_LIB='$(top_builddir)/dix/dix.O' + OS_LIB='$(top_builddir)/os/os.O' +else + DIX_LIB='$(top_builddir)/dix/libdix.la' + OS_LIB='$(top_builddir)/os/libos.la' fi -{ $as_echo "$as_me:$LINENO: result: $XORG" >&5 -$as_echo "$XORG" >&6; } -xorg_bus_linuxpci=no -xorg_bus_bsdpci=no -xorg_bus_sparc=no -if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' - XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" - XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" - XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB" - symbol_visibility= - have_visibility=disabled - if test x$SYMBOL_VISIBILITY != xno; then - { $as_echo "$as_me:$LINENO: checking for symbol visibility support" >&5 -$as_echo_n "checking for symbol visibility support... " >&6; } - if test x$GCC = xyes; then - VISIBILITY_CFLAGS="-fvisibility=hidden" - else - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then +MAIN_LIB='$(top_builddir)/dix/libmain.la' + + +MI_LIB='$(top_builddir)/mi/libmi.la' +MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' +MI_INC='-I$(top_srcdir)/mi' +FB_LIB='$(top_builddir)/fb/libfb.la' +FB_INC='-I$(top_srcdir)/fb' +MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' +MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' +CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' + +# OpenSSL used for SHA1 hashing in render/glyph.c, but we don't need all of +# the OpenSSL libraries, just libcrypto +# Some systems have matching functionality in the smaller/simpler libmd +# Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS +if test "x$SHA1_LIB" = "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1Init in -lmd" >&5 +$as_echo_n "checking for SHA1Init in -lmd... " >&6; } +if test "${ac_cv_lib_md_SHA1Init+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="-lmd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default + +/* 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 SHA1Init (); int main () { -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - +return SHA1Init (); ; 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_cv_have_decl___SUNPRO_C=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_md_SHA1Init=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_md_SHA1Init=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_md_SHA1Init" >&5 +$as_echo "$ac_cv_lib_md_SHA1Init" >&6; } +if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then : + SHA1_LIB="-lmd" + +$as_echo "#define HAVE_SHA1_IN_LIBMD 1" >>confdefs.h - ac_cv_have_decl___SUNPRO_C=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then - SUNCC="yes" + +if test "x$SHA1_LIB" = "x" ; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"OPENSSL\""; } >&5 + ($PKG_CONFIG --exists --print-errors "OPENSSL") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + openssl else - SUNCC="no" + HAVE_OPENSSL_PKC=yes fi - - if test x$SUNCC = xyes; then - VISIBILITY_CFLAGS="-xldscope=hidden" - else - have_visibility=no - fi - fi - if test x$have_visibility != xno; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "x$HAVE_OPENSSL_PKC" = xyes; then + REQUIRED_LIBS="$REQUIRED_LIBS openssl" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5 +$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - extern _X_HIDDEN int hidden_int; - extern _X_EXPORT int public_int; - extern _X_HIDDEN int hidden_int_func(void); - extern _X_EXPORT int public_int_func(void); + +/* 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 SHA1_Init (); int main () { - +return SHA1_Init (); ; 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 - have_visibility=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_SHA1_Init=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - have_visibility=no + ac_cv_lib_crypto_SHA1_Init=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_crypto_SHA1_Init" >&5 +$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; } +if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then : + SHA1_LIB="-lcrypto" +else + as_fn_error "OpenSSL must be installed in order to build the X server." "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$save_CFLAGS - fi - { $as_echo "$as_me:$LINENO: result: $have_visibility" >&5 -$as_echo "$have_visibility" >&6; } - if test x$have_visibility != xno; then - symbol_visibility=$VISIBILITY_CFLAGS - XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" - XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" - fi - fi - + fi +fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5 -$as_echo_n "checking for PCIACCESS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERCFLAGS" >&5 +$as_echo_n "checking for XSERVERCFLAGS... " >&6; } -if test -n "$PCIACCESS_CFLAGS"; then - pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVERCFLAGS_CFLAGS"; then + pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$PCIACCESS_LIBS"; then - pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVERCFLAGS_LIBS"; then + pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -25601,825 +18674,613 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1` + XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` else - PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1` + XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` fi # Put the nasty error message in config.log where it belongs - echo "$PCIACCESS_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBPCIACCESS) were not met: - -$PCIACCESS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 -Alternatively, you may set the environment variables PCIACCESS_CFLAGS -and PCIACCESS_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 ($LIBPCIACCESS) were not met: + as_fn_error "Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: -$PCIACCESS_PKG_ERRORS +$XSERVERCFLAGS_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 PCIACCESS_CFLAGS -and PCIACCESS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS +and XSERVERCFLAGS_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 PCIACCESS_CFLAGS -and PCIACCESS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS +and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +See \`config.log' for more details." "$LINENO" 5; } +else + XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS + XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_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 XSERVERLIBS" >&5 +$as_echo_n "checking for XSERVERLIBS... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVERLIBS_CFLAGS"; then + pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVERLIBS_LIBS"; then + pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 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 + XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` + else + XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XSERVERLIBS_PKG_ERRORS" >&5 + + as_fn_error "Package requirements ($REQUIRED_LIBS) were not met: + +$XSERVERLIBS_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 XSERVERLIBS_CFLAGS +and XSERVERLIBS_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 PCIACCESS_CFLAGS -and PCIACCESS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS +and XSERVERLIBS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else - PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS - PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS + XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi - SAVE_LIBS=$LIBS - SAVE_CFLAGS=$CFLAGS - CFLAGS=$PCIACCESS_CFLAGS - LIBS=$PCIACCESS_LIBS - -for ac_func in pci_system_init_dev_mem -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Autotools has some unfortunate issues with library handling. In order to +# get a server to rebuild when a dependency in the tree is changed, it must +# be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be +# listed there, or some versions of autotools will break (especially if a -L +# is required to find the library). So, we keep two sets of libraries +# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which +# will go into the _DEPENDENCIES and _LDADD of the server, and +# NAMESPACE_SYS_LIBS which will go into only the _LDADD. The +# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in +# NAMESPACE_SYS_LIBS. +# +# XSERVER_LIBS is the set of in-tree libraries which all servers require. +# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers +# require. +# +XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" +XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" +XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +UTILS_SYS_LIBS="${SYS_LIBS}" -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +# The Xorg binary needs to export symbols so that they can be used from modules +# Some platforms require extra flags to do this. gcc should set these flags +# when -rdynamic is passed to it, other compilers/linkers may need to be added +# here. +if test "x$GCC" = "xyes"; then + LD_EXPORT_SYMBOLS_FLAG="-rdynamic" fi +case $host_os in + openbsd*) + LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" + ;; +esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5 +$as_echo_n "checking if SVR4 needs to be defined... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) + I_AM_SVR4 +#endif -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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "I_AM_SVR4" >/dev/null 2>&1; then : -fi -done +$as_echo "#define SVR4 1" >>confdefs.h -for ac_func in pci_device_enable -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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f conftest* -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC" -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xvfb DDX" >&5 +$as_echo_n "checking whether to build Xvfb DDX... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5 +$as_echo "$XVFB" >&6; } + if test "x$XVFB" = xyes; then + XVFB_TRUE= + XVFB_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + XVFB_TRUE='#' + XVFB_FALSE= 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 +if test "x$XVFB" = xyes; then + XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" + XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" -for ac_func in pci_device_is_boot_vga -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNESTMODULES" >&5 +$as_echo_n "checking for XNESTMODULES... " >&6; } -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 +if test -n "$PKG_CONFIG"; then + if test -n "$XNESTMODULES_CFLAGS"; then + pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 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 - eval "$as_ac_var=yes" + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XNESTMODULES_LIBS"; then + pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + - eval "$as_ac_var=no" +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 + XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` + else + XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XNESTMODULES_PKG_ERRORS" >&5 -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_xnest=no +elif test $pkg_failed = untried; then + have_xnest=no +else + XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS + XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_xnest=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5 +$as_echo_n "checking whether to build Xnest DDX... " >&6; } +if test "x$XNEST" = xauto; then + XNEST="$have_xnest" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XNEST" >&5 +$as_echo "$XNEST" >&6; } + if test "x$XNEST" = xyes; then + XNEST_TRUE= + XNEST_FALSE='#' +else + XNEST_TRUE='#' + XNEST_FALSE= 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 + + +if test "x$XNEST" = xyes; then + if test "x$have_xnest" = xno; then + as_fn_error "Xnest build explicitly requested, but required modules not found." "$LINENO" 5 + fi + XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB" + XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" + fi -done -for ac_func in pci_device_vgaarb_init -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg DDX" >&5 +$as_echo_n "checking whether to build Xorg DDX... " >&6; } +if test "x$XORG" = xauto; then + XORG="yes" + case $host_os in + cygwin*) XORG="no" ;; + darwin*) XORG="no" ;; + esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG" >&5 +$as_echo "$XORG" >&6; } -#ifdef __STDC__ -# include -#else -# include -#endif +xorg_bus_linuxpci=no +xorg_bus_bsdpci=no +xorg_bus_sparc=no -#undef $ac_func +if test "x$XORG" = xyes; then + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' + XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" + XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" + XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + symbol_visibility= + have_visibility=disabled + if test x$SYMBOL_VISIBILITY != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol visibility support" >&5 +$as_echo_n "checking for symbol visibility support... " >&6; } + if test x$GCC = xyes; then + VISIBILITY_CFLAGS="-fvisibility=hidden" + else + ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : + SUNCC="yes" +else + SUNCC="no" +fi + if test x$SUNCC = xyes; then + VISIBILITY_CFLAGS="-xldscope=hidden" + else + have_visibility=no + fi + fi + if test x$have_visibility != xno; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + extern _X_HIDDEN int hidden_int; + extern _X_EXPORT int public_int; + extern _X_HIDDEN int hidden_int_func(void); + extern _X_EXPORT int public_int_func(void); int main () { -return $ac_func (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + have_visibility=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + have_visibility=no 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$save_CFLAGS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_visibility" >&5 +$as_echo "$have_visibility" >&6; } + if test x$have_visibility != xno; then + symbol_visibility=$VISIBILITY_CFLAGS + XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" + XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" + fi + fi -fi -done - LIBS=$SAVE_LIBS - CFLAGS=$SAVE_CFLAGS - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - case $host_os in - linux*) - if test "x$LNXAPM" = xyes; then - XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" - fi - XORG_OS="linux" - XORG_OS_SUBDIR="linux" - xorg_bus_linuxpci="yes" - linux_acpi="no" - case $host_cpu in - ia64*) - linux_ia64=yes - linux_acpi="yes" - ;; - alpha*) - linux_alpha=yes - ;; - i*86|amd64*|x86_64*) - linux_acpi="yes" - ;; - *) - ;; - esac - ;; - freebsd* | kfreebsd*-gnu | dragonfly*) - XORG_OS="freebsd" - XORG_OS_SUBDIR="bsd" - xorg_bus_bsdpci="yes" - ;; - netbsd*) - XORG_OS="netbsd" - XORG_OS_SUBDIR="bsd" - xorg_bus_bsdpci="yes" - ;; - openbsd*) - if test "x$ac_cv_BSD_APM" = xyes \ - -o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then - XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" - fi - XORG_OS="openbsd" - XORG_OS_SUBDIR="bsd" - xorg_bus_bsdpci="yes" - ;; - solaris*) - XORG_OS="solaris" - XORG_OS_SUBDIR="solaris" - # Use the same stubs as BSD for old functions, since we now - # use libpciaccess for PCI - xorg_bus_bsdpci="yes" +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5 +$as_echo_n "checking for PCIACCESS... " >&6; } -for ac_header in sys/kd.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 +if test -n "$PKG_CONFIG"; then + if test -n "$PCIACCESS_CFLAGS"; then + pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null` +else + pkg_failed=yes 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 else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$PCIACCESS_LIBS"; then + pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 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_objext; then - ac_header_compiler=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + pkg_failed=yes 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 + fi else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + pkg_failed=untried 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - eval "$as_ac_Header=\$ac_header_preproc" + _pkg_short_errors_supported=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; } + if test $_pkg_short_errors_supported = yes; then + PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"` + else + PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PCIACCESS_PKG_ERRORS" >&5 -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_fn_error "Package requirements ($LIBPCIACCESS) were not met: -fi +$PCIACCESS_PKG_ERRORS -done +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PCIACCESS_CFLAGS +and PCIACCESS_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 PCIACCESS_CFLAGS +and PCIACCESS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -for ac_header in sys/vt.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; } +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } 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> + PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS + PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + SAVE_LIBS=$LIBS + SAVE_CFLAGS=$CFLAGS + CFLAGS=$PCIACCESS_CFLAGS + LIBS=$PCIACCESS_LIBS + for ac_func in pci_system_init_dev_mem +do : + ac_fn_c_check_func "$LINENO" "pci_system_init_dev_mem" "ac_cv_func_pci_system_init_dev_mem" +if test "x$ac_cv_func_pci_system_init_dev_mem" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCI_SYSTEM_INIT_DEV_MEM 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 +done -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> + for ac_func in pci_device_enable +do : + ac_fn_c_check_func "$LINENO" "pci_device_enable" "ac_cv_func_pci_device_enable" +if test "x$ac_cv_func_pci_device_enable" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCI_DEVICE_ENABLE 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done + + for ac_func in pci_device_is_boot_vga +do : + ac_fn_c_check_func "$LINENO" "pci_device_is_boot_vga" "ac_cv_func_pci_device_is_boot_vga" +if test "x$ac_cv_func_pci_device_is_boot_vga" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCI_DEVICE_IS_BOOT_VGA 1 +_ACEOF + +fi +done -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + for ac_func in pci_device_vgaarb_init +do : + ac_fn_c_check_func "$LINENO" "pci_device_vgaarb_init" "ac_cv_func_pci_device_vgaarb_init" +if test "x$ac_cv_func_pci_device_vgaarb_init" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCI_DEVICE_VGAARB_INIT 1 +_ACEOF -# 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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; } +done + + LIBS=$SAVE_LIBS + CFLAGS=$SAVE_CFLAGS + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" + + case $host_os in + linux*) + if test "x$LNXAPM" = xyes; then + XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" + fi + XORG_OS="linux" + XORG_OS_SUBDIR="linux" + xorg_bus_linuxpci="yes" + linux_acpi="no" + case $host_cpu in + ia64*) + linux_ia64=yes + linux_acpi="yes" + ;; + alpha*) + linux_alpha=yes + ;; + i*86|amd64*|x86_64*) + linux_acpi="yes" + ;; + *) + ;; + esac + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + XORG_OS="freebsd" + XORG_OS_SUBDIR="bsd" + xorg_bus_bsdpci="yes" + ;; + netbsd*) + XORG_OS="netbsd" + XORG_OS_SUBDIR="bsd" + xorg_bus_bsdpci="yes" + ;; + openbsd*) + if test "x$ac_cv_BSD_APM" = xyes \ + -o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then + XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" + fi + XORG_OS="openbsd" + XORG_OS_SUBDIR="bsd" + xorg_bus_bsdpci="yes" + ;; + solaris*) + XORG_OS="solaris" + XORG_OS_SUBDIR="solaris" + # Use the same stubs as BSD for old functions, since we now + # use libpciaccess for PCI + xorg_bus_bsdpci="yes" + for ac_header in sys/kd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/kd.h" "ac_cv_header_sys_kd_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_kd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_KD_H 1 +_ACEOF fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + +done + + for ac_header in sys/vt.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/vt.h" "ac_cv_header_sys_vt_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_vt_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_VT_H 1 _ACEOF solaris_vt=yes else @@ -26429,75 +19290,21 @@ fi done # Check for minimum supported release - { $as_echo "$as_me:$LINENO: checking Solaris version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solaris version" >&5 $as_echo_n "checking Solaris version... " >&6; } OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e s'/\..*$//'` if test "${OS_MINOR}" -ge 7 ; then - { $as_echo "$as_me:$LINENO: result: Solaris ${OS_MINOR}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris ${OS_MINOR}" >&5 $as_echo "Solaris ${OS_MINOR}" >&6; } else - { $as_echo "$as_me:$LINENO: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5 $as_echo "Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&6; } fi if test "${OS_MINOR}" -lt 8 ; then - { { $as_echo "$as_me:$LINENO: error: This release no longer supports Solaris versions older than Solaris 8." >&5 -$as_echo "$as_me: error: This release no longer supports Solaris versions older than Solaris 8." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "This release no longer supports Solaris versions older than Solaris 8." "$LINENO" 5 fi - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - - ; - 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_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___SUNPRO_C=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then + ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : SUNCC="yes" else SUNCC="no" @@ -26506,60 +19313,8 @@ fi if test "x$SUNCC" = "xyes"; then solaris_asm_inline="yes" fi - { $as_echo "$as_me:$LINENO: checking whether _LP64 is declared" >&5 -$as_echo_n "checking whether _LP64 is declared... " >&6; } -if test "${ac_cv_have_decl__LP64+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef _LP64 - (void) _LP64; -#endif - - ; - 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_cv_have_decl__LP64=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl__LP64=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__LP64" >&5 -$as_echo "$ac_cv_have_decl__LP64" >&6; } -if test "x$ac_cv_have_decl__LP64" = x""yes; then + ac_fn_c_check_decl "$LINENO" "_LP64" "ac_cv_have_decl__LP64" "$ac_includes_default" +if test "x$ac_cv_have_decl__LP64" = x""yes; then : SOLARIS_64="yes" else SOLARIS_64="no" @@ -26579,15 +19334,10 @@ fi XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" ;; *) - { { $as_echo "$as_me:$LINENO: error: Unsupported Solaris platform. Only SPARC & x86 \ - are supported on Solaris in this release. If you are \ - interested in porting Xorg to your platform, please email \ - xorg@lists.freedesktop.org." >&5 -$as_echo "$as_me: error: Unsupported Solaris platform. Only SPARC & x86 \ + as_fn_error "Unsupported Solaris platform. Only SPARC & x86 \ are supported on Solaris in this release. If you are \ interested in porting Xorg to your platform, please email \ - xorg@lists.freedesktop.org." >&2;} - { (exit 1); exit 1; }; } ;; + xorg@lists.freedesktop.org." "$LINENO" 5 ;; esac if test x$solaris_asm_inline = xyes ; then @@ -26606,13 +19356,9 @@ $as_echo "$as_me: error: Unsupported Solaris platform. Only SPARC & x86 \ *) XORG_OS="unknown" XORG_OS_SUBDIR="unknown" - { { $as_echo "$as_me:$LINENO: error: Your OS is unknown. Xorg currently only supports Linux, \ - Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \ - Xorg to your platform, please email xorg@lists.freedesktop.org." >&5 -$as_echo "$as_me: error: Your OS is unknown. Xorg currently only supports Linux, \ + as_fn_error "Your OS is unknown. Xorg currently only supports Linux, \ Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \ - Xorg to your platform, please email xorg@lists.freedesktop.org." >&2;} - { (exit 1); exit 1; }; } + Xorg to your platform, please email xorg@lists.freedesktop.org." "$LINENO" 5 ;; esac @@ -26628,40 +19374,44 @@ $as_echo "$as_me: error: Your OS is unknown. Xorg currently only supports Linux, if test "x$DGA" = xauto; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DGA" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5 $as_echo_n "checking for DGA... " >&6; } -if test -n "$DGA_CFLAGS"; then - pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DGA_CFLAGS"; then + pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DGA_LIBS"; then - pkg_cv_DGA_LIBS="$DGA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DGA_LIBS"; then + pkg_cv_DGA_LIBS="$DGA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -26674,14 +19424,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` + DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` else - DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` + DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` fi # Put the nasty error message in config.log where it belongs echo "$DGA_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; } DGA=no elif test $pkg_failed = untried; then @@ -26689,7 +19439,7 @@ elif test $pkg_failed = untried; then else DGA_CFLAGS=$pkg_cv_DGA_CFLAGS DGA_LIBS=$pkg_cv_DGA_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } DGA=yes fi @@ -26698,40 +19448,44 @@ fi XORG_MODULES="$XORG_MODULES $DGAPROTO" pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DGA" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5 $as_echo_n "checking for DGA... " >&6; } -if test -n "$DGA_CFLAGS"; then - pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DGA_CFLAGS"; then + pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DGA_LIBS"; then - pkg_cv_DGA_LIBS="$DGA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DGA_LIBS"; then + pkg_cv_DGA_LIBS="$DGA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -26744,25 +19498,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` + DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` else - DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` + DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` fi # Put the nasty error message in config.log where it belongs echo "$DGA_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($DGAPROTO) were not met: - -$DGA_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 DGA_CFLAGS -and DGA_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 ($DGAPROTO) were not met: + as_fn_error "Package requirements ($DGAPROTO) were not met: $DGA_PKG_ERRORS @@ -26772,22 +19515,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DGA_CFLAGS and DGA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DGA_CFLAGS -and DGA_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26796,64 +19528,63 @@ and DGA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else DGA_CFLAGS=$pkg_cv_DGA_CFLAGS DGA_LIBS=$pkg_cv_DGA_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi -cat >>confdefs.h <<\_ACEOF -#define DGA 1 -_ACEOF +$as_echo "#define DGA 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define XFreeXDGA 1 -_ACEOF +$as_echo "#define XFreeXDGA 1" >>confdefs.h fi if test "x$XF86VIDMODE" = xauto; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5 $as_echo_n "checking for XF86VIDMODE... " >&6; } -if test -n "$XF86VIDMODE_CFLAGS"; then - pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XF86VIDMODE_CFLAGS"; then + pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XF86VIDMODE_LIBS"; then - pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XF86VIDMODE_LIBS"; then + pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -26866,14 +19597,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` + XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` else - XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` + XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` fi # Put the nasty error message in config.log where it belongs echo "$XF86VIDMODE_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; } XF86VIDMODE=no elif test $pkg_failed = untried; then @@ -26881,7 +19612,7 @@ elif test $pkg_failed = untried; then else XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } XF86VIDMODE=yes fi @@ -26890,40 +19621,44 @@ fi XORG_MODULES="$XORG_MODULES $VIDMODEPROTO" pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5 $as_echo_n "checking for XF86VIDMODE... " >&6; } -if test -n "$XF86VIDMODE_CFLAGS"; then - pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XF86VIDMODE_CFLAGS"; then + pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XF86VIDMODE_LIBS"; then - pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XF86VIDMODE_LIBS"; then + pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -26936,25 +19671,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` + XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` else - XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` + XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` fi # Put the nasty error message in config.log where it belongs echo "$XF86VIDMODE_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($VIDMODEPROTO) were not met: - -$XF86VIDMODE_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 XF86VIDMODE_CFLAGS -and XF86VIDMODE_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 ($VIDMODEPROTO) were not met: + as_fn_error "Package requirements ($VIDMODEPROTO) were not met: $XF86VIDMODE_PKG_ERRORS @@ -26964,22 +19688,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS -and XF86VIDMODE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26988,59 +19701,60 @@ and XF86VIDMODE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi -cat >>confdefs.h <<\_ACEOF -#define XF86VIDMODE 1 -_ACEOF +$as_echo "#define XF86VIDMODE 1" >>confdefs.h fi if test -n "$XORG_MODULES"; then pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XORG_MODULES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG_MODULES" >&5 $as_echo_n "checking for XORG_MODULES... " >&6; } -if test -n "$XORG_MODULES_CFLAGS"; then - pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XORG_MODULES_CFLAGS"; then + pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XORG_MODULES_CFLAGS=`$PKG_CONFIG --cflags "$XORG_MODULES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XORG_MODULES_LIBS"; then - pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XORG_MODULES_LIBS"; then + pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XORG_MODULES_LIBS=`$PKG_CONFIG --libs "$XORG_MODULES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -27053,25 +19767,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1` + XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"` else - XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1` + XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"` fi # Put the nasty error message in config.log where it belongs echo "$XORG_MODULES_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($XORG_MODULES) were not met: - -$XORG_MODULES_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 XORG_MODULES_CFLAGS -and XORG_MODULES_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 ($XORG_MODULES) were not met: + as_fn_error "Package requirements ($XORG_MODULES) were not met: $XORG_MODULES_PKG_ERRORS @@ -27081,22 +19784,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XORG_MODULES_CFLAGS and XORG_MODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XORG_MODULES_CFLAGS -and XORG_MODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27105,12 +19797,11 @@ and XORG_MODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi @@ -27126,9 +19817,9 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -27141,14 +19832,14 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" @@ -27157,18 +19848,16 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "x$PERL" = xno; then - { { $as_echo "$as_me:$LINENO: error: Perl is required to build the XFree86/Xorg DDX." >&5 -$as_echo "$as_me: error: Perl is required to build the XFree86/Xorg DDX." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Perl is required to build the XFree86/Xorg DDX." "$LINENO" 5 fi @@ -27178,24 +19867,16 @@ $as_echo "$as_me: error: Perl is required to build the XFree86/Xorg DDX." >&2;} CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" LOGPREFIX="$logdir/Xorg." -cat >>confdefs.h <<\_ACEOF -#define XORG_SERVER 1 -_ACEOF +$as_echo "#define XORG_SERVER 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define XORGSERVER 1 -_ACEOF +$as_echo "#define XORGSERVER 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define XFree86Server 1 -_ACEOF +$as_echo "#define XFree86Server 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define XFree86LOADER 1 -_ACEOF +$as_echo "#define XFree86LOADER 1" >>confdefs.h cat >>confdefs.h <<_ACEOF @@ -27203,19 +19884,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define NEED_XF86_TYPES 1 -_ACEOF +$as_echo "#define NEED_XF86_TYPES 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define NEED_XF86_PROTOTYPES 1 -_ACEOF +$as_echo "#define NEED_XF86_PROTOTYPES 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define __XSERVERNAME__ "Xorg" -_ACEOF +$as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h prefix_NONE= @@ -27308,15 +19983,11 @@ cat >>confdefs.h <<_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define XSERVER_LIBPCIACCESS 1 -_ACEOF +$as_echo "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h if test "x$VGAHW" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define WITH_VGAHW 1 -_ACEOF +$as_echo "#define WITH_VGAHW 1" >>confdefs.h fi @@ -27432,7 +20103,7 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether to build XWin DDX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XWin DDX" >&5 $as_echo_n "checking whether to build XWin DDX... " >&6; } if test "x$XWIN" = xauto; then case $host_os in @@ -27441,16 +20112,16 @@ if test "x$XWIN" = xauto; then *) XWIN="no" ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $XWIN" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XWIN" >&5 $as_echo "$XWIN" >&6; } if test "x$XWIN" = xyes; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$WINDOWSWMPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then WINDOWSWM=yes else WINDOWSWM=no @@ -27463,9 +20134,9 @@ _ACEOF if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then +if test "${ac_cv_prog_WINDRES+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$WINDRES"; then @@ -27476,24 +20147,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 $as_echo "$WINDRES" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -27503,9 +20174,9 @@ if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_WINDRES"; then @@ -27516,24 +20187,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 $as_echo "$ac_ct_WINDRES" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -27542,7 +20213,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -27557,40 +20228,44 @@ fi XWIN_SERVER_NAME=XWin pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5 $as_echo_n "checking for XWINMODULES... " >&6; } -if test -n "$XWINMODULES_CFLAGS"; then - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XWINMODULES_CFLAGS"; then + pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XWINMODULES_LIBS"; then - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XWINMODULES_LIBS"; then + pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -27603,25 +20278,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` else - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` fi # Put the nasty error message in config.log where it belongs echo "$XWINMODULES_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_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 XWINMODULES_CFLAGS -and XWINMODULES_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 (x11 xdmcp xau xfont) were not met: + as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met: $XWINMODULES_PKG_ERRORS @@ -27631,22 +20295,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XWINMODULES_CFLAGS and XWINMODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27655,26 +20308,21 @@ and XWINMODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi -cat >>confdefs.h <<\_ACEOF -#define HAS_DEVWINDOWS 1 -_ACEOF +$as_echo "#define HAS_DEVWINDOWS 1" >>confdefs.h if test "x$WINDOWSWM" = xyes ; then -cat >>confdefs.h <<\_ACEOF -#define ROOTLESS 1 -_ACEOF +$as_echo "#define ROOTLESS 1" >>confdefs.h CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND" fi @@ -27685,40 +20333,44 @@ _ACEOF XWIN_SERVER_NAME=Xming pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5 $as_echo_n "checking for XWINMODULES... " >&6; } -if test -n "$XWINMODULES_CFLAGS"; then - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XWINMODULES_CFLAGS"; then + pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XWINMODULES_LIBS"; then - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XWINMODULES_LIBS"; then + pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -27731,25 +20383,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` else - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` fi # Put the nasty error message in config.log where it belongs echo "$XWINMODULES_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_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 XWINMODULES_CFLAGS -and XWINMODULES_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 (x11 xdmcp xau xfont) were not met: + as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met: $XWINMODULES_PKG_ERRORS @@ -27759,22 +20400,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XWINMODULES_CFLAGS and XWINMODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27783,24 +20413,19 @@ and XWINMODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi -cat >>confdefs.h <<\_ACEOF -#define RELOCATE_PROJECTROOT 1 -_ACEOF +$as_echo "#define RELOCATE_PROJECTROOT 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define HAS_WINSOCK 1 -_ACEOF +$as_echo "#define HAS_WINSOCK 1" >>confdefs.h XWIN_SYS_LIBS=-lwinsock2 ;; @@ -27813,39 +20438,29 @@ _ACEOF if test "x$DEBUGGING" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define CYGDEBUG 1 -_ACEOF +$as_echo "#define CYGDEBUG 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define CYGWINDOWING_DEBUG 1 -_ACEOF +$as_echo "#define CYGWINDOWING_DEBUG 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define CYGMULTIWINDOW_DEBUG 1 -_ACEOF +$as_echo "#define CYGMULTIWINDOW_DEBUG 1" >>confdefs.h fi -cat >>confdefs.h <<\_ACEOF -#define DDXOSVERRORF 1 -_ACEOF +$as_echo "#define DDXOSVERRORF 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define DDXBEFORERESET 1 -_ACEOF +$as_echo "#define DDXBEFORERESET 1" >>confdefs.h if test "x$XF86VIDMODE" = xyes; then - { $as_echo "$as_me:$LINENO: Disabling XF86VidMode extension" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling XF86VidMode extension" >&5 $as_echo "$as_me: Disabling XF86VidMode extension" >&6;} XF86VIDMODE=no fi if test "x$COMPOSITE" = xyes; then - { $as_echo "$as_me:$LINENO: Disabling Composite extension" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling Composite extension" >&5 $as_echo "$as_me: Disabling Composite extension" >&6;} COMPOSITE=no fi @@ -27925,31 +20540,23 @@ fi if test "x$XQUARTZ" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define XQUARTZ 1 -_ACEOF +$as_echo "#define XQUARTZ 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define ROOTLESS 1 -_ACEOF +$as_echo "#define ROOTLESS 1" >>confdefs.h DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB" - { $as_echo "$as_me:$LINENO: checking for xp_init in -lXplugin" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5 $as_echo_n "checking for xp_init in -lXplugin... " >&6; } -if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then +if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXplugin $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. @@ -27967,43 +20574,18 @@ return xp_init (); 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_Xplugin_xp_init=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xplugin_xp_init=no + ac_cv_lib_Xplugin_xp_init=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_Xplugin_xp_init" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xplugin_xp_init" >&5 $as_echo "$ac_cv_lib_Xplugin_xp_init" >&6; } -if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then +if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then : : fi @@ -28012,40 +20594,44 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XPBPROXY" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPBPROXY" >&5 $as_echo_n "checking for XPBPROXY... " >&6; } -if test -n "$XPBPROXY_CFLAGS"; then - pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XPBPROXY_CFLAGS"; then + pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XPBPROXY_CFLAGS=`$PKG_CONFIG --cflags "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XPBPROXY_LIBS"; then - pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XPBPROXY_LIBS"; then + pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XPBPROXY_LIBS=`$PKG_CONFIG --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -28058,25 +20644,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` + XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` else - XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` + XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` fi # Put the nasty error message in config.log where it belongs echo "$XPBPROXY_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: - -$XPBPROXY_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 XPBPROXY_CFLAGS -and XPBPROXY_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 ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: + as_fn_error "Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: $XPBPROXY_PKG_ERRORS @@ -28086,22 +20661,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XPBPROXY_CFLAGS and XPBPROXY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XPBPROXY_CFLAGS -and XPBPROXY_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28110,29 +20674,24 @@ and XPBPROXY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi if test "x$XQUARTZ_SPARKLE" = xyes ; then -cat >>confdefs.h <<\_ACEOF -#define XQUARTZ_SPARKLE 1 -_ACEOF +$as_echo "#define XQUARTZ_SPARKLE 1" >>confdefs.h fi if test "x$STANDALONE_XPBPROXY" = xyes ; then -cat >>confdefs.h <<\_ACEOF -#define STANDALONE_XPBPROXY 1 -_ACEOF +$as_echo "#define STANDALONE_XPBPROXY 1" >>confdefs.h fi fi @@ -28150,9 +20709,9 @@ OBJCFLAGS='$(CFLAGS)' depcc="$OBJC" am_compiler_list='gcc3 gcc' -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -28258,7 +20817,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 $as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type @@ -28301,40 +20860,44 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DMXMODULES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXMODULES" >&5 $as_echo_n "checking for DMXMODULES... " >&6; } -if test -n "$DMXMODULES_CFLAGS"; then - pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXMODULES_CFLAGS"; then + pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXMODULES_CFLAGS=`$PKG_CONFIG --cflags "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DMXMODULES_LIBS"; then - pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXMODULES_LIBS"; then + pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXMODULES_LIBS=`$PKG_CONFIG --libs "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -28347,14 +20910,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` + DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` else - DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` + DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` fi # Put the nasty error message in config.log where it belongs echo "$DMXMODULES_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_dmx=no elif test $pkg_failed = untried; then @@ -28362,11 +20925,11 @@ elif test $pkg_failed = untried; then else DMXMODULES_CFLAGS=$pkg_cv_DMXMODULES_CFLAGS DMXMODULES_LIBS=$pkg_cv_DMXMODULES_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } have_dmx=yes fi -{ $as_echo "$as_me:$LINENO: checking whether to build Xdmx DDX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xdmx DDX" >&5 $as_echo_n "checking whether to build Xdmx DDX... " >&6; } if test "x$DMX" = xauto; then DMX="$have_dmx" @@ -28375,7 +20938,7 @@ if test "x$DMX" = xauto; then darwin*) DMX="no" ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $DMX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMX" >&5 $as_echo "$DMX" >&6; } if test "x$DMX" = xyes; then DMX_TRUE= @@ -28386,294 +20949,31 @@ else fi +DOXYGEN="not_found" + if test "x$DMX" = xyes; then if test "x$have_dmx" = xno; then - { { $as_echo "$as_me:$LINENO: error: Xdmx build explicitly requested, but required - modules not found." >&5 -$as_echo "$as_me: error: Xdmx build explicitly requested, but required - modules not found." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Xdmx build explicitly requested, but required + modules not found." "$LINENO" 5 fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" - XDMX_SYS_LIBS="$DMXMODULES_LIBS" - - - - - if test "${ac_cv_header_linux_input_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5 -$as_echo_n "checking for linux/input.h... " >&6; } -if test "${ac_cv_header_linux_input_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -$as_echo "$ac_cv_header_linux_input_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking linux/input.h usability" >&5 -$as_echo_n "checking linux/input.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking linux/input.h presence" >&5 -$as_echo_n "checking linux/input.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: linux/input.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: linux/input.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: linux/input.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: linux/input.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: linux/input.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: linux/input.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: linux/input.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5 -$as_echo_n "checking for linux/input.h... " >&6; } -if test "${ac_cv_header_linux_input_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_linux_input_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -$as_echo "$ac_cv_header_linux_input_h" >&6; } - -fi -if test "x$ac_cv_header_linux_input_h" = x""yes; then - DMX_BUILD_USB="yes" -else - DMX_BUILD_USB="no" -fi - - - if test "${ac_cv_header_linux_keyboard_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5 -$as_echo_n "checking for linux/keyboard.h... " >&6; } -if test "${ac_cv_header_linux_keyboard_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5 -$as_echo "$ac_cv_header_linux_keyboard_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h usability" >&5 -$as_echo_n "checking linux/keyboard.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h presence" >&5 -$as_echo_n "checking linux/keyboard.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5 -$as_echo_n "checking for linux/keyboard.h... " >&6; } -if test "${ac_cv_header_linux_keyboard_h+set}" = set; then - $as_echo_n "(cached) " >&6 + XDMX_SYS_LIBS="$DMXMODULES_LIBS" + + + + + ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_input_h" = x""yes; then : + DMX_BUILD_USB="yes" else - ac_cv_header_linux_keyboard_h=$ac_header_preproc + DMX_BUILD_USB="no" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5 -$as_echo "$ac_cv_header_linux_keyboard_h" >&6; } -fi -if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then + + ac_fn_c_check_header_mongrel "$LINENO" "linux/keyboard.h" "ac_cv_header_linux_keyboard_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then : DMX_BUILD_LNX="yes" else DMX_BUILD_LNX="no" @@ -28682,40 +20982,44 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMXCONFIG_DEP" >&5 $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; } -if test -n "$XDMXCONFIG_DEP_CFLAGS"; then - pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XDMXCONFIG_DEP_CFLAGS"; then + pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XDMXCONFIG_DEP_CFLAGS=`$PKG_CONFIG --cflags "xaw7 xmu xt xpm x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XDMXCONFIG_DEP_LIBS"; then - pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XDMXCONFIG_DEP_LIBS"; then + pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XDMXCONFIG_DEP_LIBS=`$PKG_CONFIG --libs "xaw7 xmu xt xpm x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -28728,25 +21032,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1` + XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` else - XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1` + XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` fi # Put the nasty error message in config.log where it belongs echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (xaw7 xmu xt xpm x11) were not met: - -$XDMXCONFIG_DEP_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 XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_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 (xaw7 xmu xt xpm x11) were not met: + as_fn_error "Package requirements (xaw7 xmu xt xpm x11) were not met: $XDMXCONFIG_DEP_PKG_ERRORS @@ -28756,22 +21049,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28780,12 +21062,11 @@ and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XDMXCONFIG_DEP_CFLAGS=$pkg_cv_XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS=$pkg_cv_XDMXCONFIG_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi @@ -28793,40 +21074,44 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXEXAMPLES_DEP" >&5 $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; } -if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then + pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DMXEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXEXAMPLES_DEP_LIBS"; then + pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -28839,25 +21124,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` + DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` else - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` + DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met: - -$DMXEXAMPLES_DEP_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 DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_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 ($LIBDMX $LIBXEXT x11) were not met: + as_fn_error "Package requirements ($LIBDMX $LIBXEXT x11) were not met: $DMXEXAMPLES_DEP_PKG_ERRORS @@ -28867,22 +21141,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28891,52 +21154,55 @@ and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else DMXEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS=$pkg_cv_DMXEXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXMUEXAMPLES_DEP" >&5 $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; } -if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then + pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then + pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXXMUEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -28949,25 +21215,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` + DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` else - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` + DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: - -$DMXXMUEXAMPLES_DEP_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 DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_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 ($LIBDMX xmu $LIBXEXT x11) were not met: + as_fn_error "Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: $DMXXMUEXAMPLES_DEP_PKG_ERRORS @@ -28977,22 +21232,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29001,52 +21245,55 @@ and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else DMXXMUEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS=$pkg_cv_DMXXMUEXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXIEXAMPLES_DEP" >&5 $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; } -if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then + pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then + pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_DMXXIEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -29059,25 +21306,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` + DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` else - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` + DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: - -$DMXXIEXAMPLES_DEP_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 DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_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 ($LIBDMX $LIBXI $LIBXEXT x11) were not met: + as_fn_error "Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: $DMXXIEXAMPLES_DEP_PKG_ERRORS @@ -29087,22 +21323,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29111,52 +21336,55 @@ and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else DMXXIEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS=$pkg_cv_DMXXIEXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTSTEXAMPLES_DEP" >&5 $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; } -if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then - pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then + pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XTSTEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXTST $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XTSTEXAMPLES_DEP_LIBS"; then - pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XTSTEXAMPLES_DEP_LIBS"; then + pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XTSTEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXTST $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -29169,25 +21397,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` + XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` else - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` + XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met: - -$XTSTEXAMPLES_DEP_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 XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_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 ($LIBXTST $LIBXEXT x11) were not met: + as_fn_error "Package requirements ($LIBXTST $LIBXEXT x11) were not met: $XTSTEXAMPLES_DEP_PKG_ERRORS @@ -29197,22 +21414,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29221,52 +21427,55 @@ and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XTSTEXAMPLES_DEP_CFLAGS=$pkg_cv_XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS=$pkg_cv_XTSTEXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRESEXAMPLES_DEP" >&5 $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; } -if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then - pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then + pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XRESEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "xres $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XRESEXAMPLES_DEP_LIBS"; then - pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XRESEXAMPLES_DEP_LIBS"; then + pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XRESEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "xres $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -29279,25 +21488,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1` + XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"` else - XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1` + XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (xres $LIBXEXT x11) were not met: - -$XRESEXAMPLES_DEP_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 XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_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 (xres $LIBXEXT x11) were not met: + as_fn_error "Package requirements (xres $LIBXEXT x11) were not met: $XRESEXAMPLES_DEP_PKG_ERRORS @@ -29307,22 +21505,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29331,52 +21518,55 @@ and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else XRESEXAMPLES_DEP_CFLAGS=$pkg_cv_XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS=$pkg_cv_XRESEXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXAMPLES_DEP" >&5 $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; } -if test -n "$X11EXAMPLES_DEP_CFLAGS"; then - pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$X11EXAMPLES_DEP_CFLAGS"; then + pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_X11EXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$X11EXAMPLES_DEP_LIBS"; then - pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$X11EXAMPLES_DEP_LIBS"; then + pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_X11EXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -29389,25 +21579,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1` + X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"` else - X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1` + X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"` fi # Put the nasty error message in config.log where it belongs echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXEXT x11) were not met: - -$X11EXAMPLES_DEP_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 X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_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 ($LIBXEXT x11) were not met: + as_fn_error "Package requirements ($LIBXEXT x11) were not met: $X11EXAMPLES_DEP_PKG_ERRORS @@ -29417,12 +21596,11 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS and X11EXAMPLES_DEP_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. @@ -29431,215 +21609,114 @@ and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -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 X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else X11EXAMPLES_DEP_CFLAGS=$pkg_cv_X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS=$pkg_cv_X11EXAMPLES_DEP_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi -fi - if test "x$DMX_BUILD_LNX" = xyes; then - DMX_BUILD_LNX_TRUE= - DMX_BUILD_LNX_FALSE='#' -else - DMX_BUILD_LNX_TRUE='#' - DMX_BUILD_LNX_FALSE= -fi - - if test "x$DMX_BUILD_USB" = xyes; then - DMX_BUILD_USB_TRUE= - DMX_BUILD_USB_FALSE='#' -else - DMX_BUILD_USB_TRUE='#' - DMX_BUILD_USB_FALSE= -fi - - - -XEPHYR_LIBS= -XEPHYR_INCS= -XSDL_LIBS= -XSDL_INCS= -XSDL_DIRS= - if test x$KDRIVE = xyes; then - KDRIVE_TRUE= - KDRIVE_FALSE='#' -else - KDRIVE_TRUE='#' - KDRIVE_FALSE= fi - -if test "$KDRIVE" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define KDRIVESERVER 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define KDRIVEDDXACTIONS /**/ -_ACEOF - - - - -for ac_header in sys/vm86.h sys/io.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 +# Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; 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_DOXYGEN+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case $DOXYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOXYGEN="$DOXYGEN" # 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_DOXYGEN="$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 + + test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="not_found" + ;; 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 +fi +DOXYGEN=$ac_cv_path_DOXYGEN +if test -n "$DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +$as_echo "$DOXYGEN" >&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_header_compiler=no +if test "x$DOXYGEN" = "xnot_found" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&5 +$as_echo "$as_me: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&2;} 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 "x$DOXYGEN" != "xnot_found"; then + HAVE_DOXYGEN_TRUE= + HAVE_DOXYGEN_FALSE='#' +else + HAVE_DOXYGEN_TRUE='#' + HAVE_DOXYGEN_FALSE= +fi -# 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 + if test "x$DMX_BUILD_LNX" = xyes; then + DMX_BUILD_LNX_TRUE= + DMX_BUILD_LNX_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + DMX_BUILD_LNX_TRUE='#' + DMX_BUILD_LNX_FALSE= +fi - ac_header_preproc=no + if test "x$DMX_BUILD_USB" = xyes; then + DMX_BUILD_USB_TRUE= + DMX_BUILD_USB_FALSE='#' +else + DMX_BUILD_USB_TRUE='#' + DMX_BUILD_USB_FALSE= 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 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 + +XEPHYR_LIBS= +XEPHYR_INCS= + + if test x$KDRIVE = xyes; then + KDRIVE_TRUE= + KDRIVE_FALSE='#' else - eval "$as_ac_Header=\$ac_header_preproc" + KDRIVE_TRUE='#' + KDRIVE_FALSE= 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 +if test "$KDRIVE" = yes; then + +$as_echo "#define KDRIVESERVER 1" >>confdefs.h + + +$as_echo "#define KDRIVEDDXACTIONS /**/" >>confdefs.h + + + for ac_header in sys/vm86.h sys/io.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 @@ -29655,157 +21732,16 @@ done if test "x$KDRIVEVESA" = xyes; then KDRIVEFBDEVLIB=yes -cat >>confdefs.h <<\_ACEOF -#define KDRIVEVESA 1 -_ACEOF +$as_echo "#define KDRIVEVESA 1" >>confdefs.h fi - -for ac_header in linux/fb.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_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 linux/fb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_fb_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LINUX_FB_H 1 _ACEOF fi @@ -29819,49 +21755,51 @@ done if test "x$XFBDEV" = xyes; then KDRIVEFBDEVLIB=yes -cat >>confdefs.h <<\_ACEOF -#define KDRIVEFBDEV 1 -_ACEOF +$as_echo "#define KDRIVEFBDEV 1" >>confdefs.h fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for TSLIB" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 $as_echo_n "checking for TSLIB... " >&6; } -if test -n "$TSLIB_CFLAGS"; then - pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$TSLIB_CFLAGS"; then + pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$TSLIB_LIBS"; then - pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$TSLIB_LIBS"; then + pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -29874,14 +21812,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1` + TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"` else - TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1` + TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"` fi # Put the nasty error message in config.log where it belongs echo "$TSLIB_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_TSLIB="no" elif test $pkg_failed = untried; then @@ -29889,23 +21827,19 @@ elif test $pkg_failed = untried; then else TSLIB_CFLAGS=$pkg_cv_TSLIB_CFLAGS TSLIB_LIBS=$pkg_cv_TSLIB_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } HAVE_TSLIB="yes" fi if test "x$HAVE_TSLIB" = xno; then - { $as_echo "$as_me:$LINENO: checking for ts_open in -lts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ts_open in -lts" >&5 $as_echo_n "checking for ts_open in -lts... " >&6; } -if test "${ac_cv_lib_ts_ts_open+set}" = set; then +if test "${ac_cv_lib_ts_ts_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lts $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. @@ -29923,230 +21857,35 @@ return ts_open (); 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_ts_ts_open=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ts_ts_open=no + ac_cv_lib_ts_ts_open=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_ts_ts_open" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ts_ts_open" >&5 $as_echo "$ac_cv_lib_ts_ts_open" >&6; } -if test "x$ac_cv_lib_ts_ts_open" = x""yes; then +if test "x$ac_cv_lib_ts_ts_open" = x""yes; then : HAVE_TSLIB="yes" fi fi - if test "xTSLIB" = xauto; then - TSLIB="$HAVE_TSLIB" - fi - - if test "x$TSLIB" = xyes; then - if ! test "x$HAVE_TSLIB" = xyes; then - { { $as_echo "$as_me:$LINENO: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&5 -$as_echo "$as_me: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&2;} - { (exit 1); exit 1; }; } - else - -cat >>confdefs.h <<\_ACEOF -#define TSLIB 1 -_ACEOF - - fi - fi - - -for ac_header in SDL/SDL.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test x"$ac_cv_header_SDL_SDL_h" = xyes && test "x$XSDL" = xauto; then - XSDL=yes + if test "xTSLIB" = xauto; then + TSLIB="$HAVE_TSLIB" fi - if test x"$XSDL" = xyes; then - # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES) + if test "x$TSLIB" = xyes; then + if ! test "x$HAVE_TSLIB" = xyes; then + as_fn_error "tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" "$LINENO" 5 + else -cat >>confdefs.h <<\_ACEOF -#define XSDLSERVER 1 -_ACEOF +$as_echo "#define TSLIB 1" >>confdefs.h - XSDL_LIBS="`sdl-config --libs`" - XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS" + fi fi XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp" @@ -30159,40 +21898,44 @@ _ACEOF pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for XEPHYR" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEPHYR" >&5 $as_echo_n "checking for XEPHYR... " >&6; } -if test -n "$XEPHYR_CFLAGS"; then - pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XEPHYR_CFLAGS"; then + pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XEPHYR_LIBS"; then - pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$XEPHYR_LIBS"; then + pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -30205,14 +21948,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` + XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` else - XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` + XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` fi # Put the nasty error message in config.log where it belongs echo "$XEPHYR_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; } xephyr="no" elif test $pkg_failed = untried; then @@ -30220,7 +21963,7 @@ elif test $pkg_failed = untried; then else XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } xephyr="yes" fi @@ -30229,106 +21972,18 @@ fi fi # Xephyr needs nanosleep() which is in librt on Solaris - { $as_echo "$as_me:$LINENO: checking for nanosleep" >&5 -$as_echo_n "checking for nanosleep... " >&6; } -if test "${ac_cv_func_nanosleep+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 nanosleep to an innocuous variant, in case declares nanosleep. - For example, HP-UX 11i declares gettimeofday. */ -#define nanosleep innocuous_nanosleep - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char nanosleep (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef nanosleep - -/* 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 nanosleep (); -/* 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_nanosleep || defined __stub___nanosleep -choke me -#endif - -int -main () -{ -return nanosleep (); - ; - 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_nanosleep=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_nanosleep=no -fi + ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +if test "x$ac_cv_func_nanosleep" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_nanosleep" >&5 -$as_echo "$ac_cv_func_nanosleep" >&6; } -if test "x$ac_cv_func_nanosleep" = x""yes; then - : else - { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 $as_echo_n "checking for nanosleep in -lrt... " >&6; } -if test "${ac_cv_lib_rt_nanosleep+set}" = set; then +if test "${ac_cv_lib_rt_nanosleep+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $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. @@ -30346,43 +22001,18 @@ return nanosleep (); 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_rt_nanosleep=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_rt_nanosleep=no + ac_cv_lib_rt_nanosleep=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_rt_nanosleep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 $as_echo "$ac_cv_lib_rt_nanosleep" >&6; } -if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then +if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then : XEPHYR_LIBS="$XEPHYR_LIBS -lrt" fi @@ -30413,8 +22043,6 @@ fi - - fi @@ -30454,14 +22082,6 @@ else KDRIVEFBDEV_FALSE= fi - if test x"$XSDL" = xyes; then - XSDLSERVER_TRUE= - XSDLSERVER_FALSE='#' -else - XSDLSERVER_TRUE='#' - XSDLSERVER_FALSE= -fi - if test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes; then XEPHYR_TRUE= XEPHYR_FALSE='#' @@ -30488,11 +22108,7 @@ fi -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -30501,243 +22117,52 @@ cat >>conftest.$ac_ext <<_ACEOF #endif int -main () -{ - - ; - 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 - -cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix - eval ac_define_dir="\"$prefix\"" - eval ac_define_dir="\"$ac_define_dir\"" - PROJECTROOT="$ac_define_dir" - - -cat >>confdefs.h <<_ACEOF -#define PROJECTROOT "$ac_define_dir" -_ACEOF - - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE - - -BUILD_DATE="$(date +'%Y%m%d')" - -BUILD_TIME="$(date +'1%H%M%S')" - - -DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" - - - - - - - -# Man page sections - used in config utils & generating man pages - - - -if test x$APP_MAN_SUFFIX = x ; then - APP_MAN_SUFFIX=1 -fi -if test x$APP_MAN_DIR = x ; then - APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -fi - -if test x$LIB_MAN_SUFFIX = x ; then - LIB_MAN_SUFFIX=3 -fi -if test x$LIB_MAN_DIR = x ; then - LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -fi - -if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac -fi -if test x$FILE_MAN_DIR = x ; then - FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -fi - -if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac -fi -if test x$MISC_MAN_DIR = x ; then - MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -fi - -if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac -fi -if test x$DRIVER_MAN_DIR = x ; then - DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -fi - -if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; - esac -fi -if test x$ADMIN_MAN_DIR = x ; then - ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -fi - - - - - - - - - - - - - - - - -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ -mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" - - - - - - # Check whether --enable-shave was given. -if test "${enable_shave+set}" = set; then - enableval=$enable_shave; -else - enable_shave=yes - -fi - - - - if test x"$enable_shave" = xyes; then - shavedir="$ac_pwd/." - - - MAKEFLAGS=-s - - AM_MAKEFLAGS='`test -z $V && echo -s`' - - - # Extract the first word of "sed", so it can be a program name with args. -set dummy sed; 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_prog_SED+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$SED"; then - ac_cv_prog_SED="$SED" # Let the user override the test. -else -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_prog_SED="sed" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define _GNU_SOURCE 1" >>confdefs.h - test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false" -fi -fi -SED=$ac_cv_prog_SED -if test -n "$SED"; then - { $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$prefix\"" + eval ac_define_dir="\"$ac_define_dir\"" + PROJECTROOT="$ac_define_dir" - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" +cat >>confdefs.h <<_ACEOF +#define PROJECTROOT "$ac_define_dir" +_ACEOF - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +BUILD_DATE="$(date +'%Y%m%d')" +BUILD_TIME="$(date +'1%H%M%S')" - V=@ - else - V=1 - fi - Q='$(V:1=)' +DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" -ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile fb/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/damage/Makefile miext/shadow/Makefile miext/cw/Makefile miext/rootless/Makefile os/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/doc/devel/Makefile hw/xfree86/doc/man/Makefile hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/sco/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/sysv/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf8_16bpp/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/doc/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile hw/xnest/Makefile hw/xwin/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/doc/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/sdl/Makefile hw/kdrive/src/Makefile test/Makefile test/xi2/Makefile xorg-server.pc" + + + +ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile fb/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/damage/Makefile miext/shadow/Makefile miext/cw/Makefile miext/rootless/Makefile os/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/doc/devel/Makefile hw/xfree86/doc/man/Makefile hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/sco/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/sysv/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf8_16bpp/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/doc/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile hw/xnest/Makefile hw/xwin/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/doc/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/src/Makefile test/Makefile test/xi2/Makefile xorg-server.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -30766,13 +22191,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -30780,8 +22205,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -30804,11 +22229,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -30828,8 +22253,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -30845,721 +22270,419 @@ else fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCCAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XSERVER_DTRACE_TRUE}" && test -z "${XSERVER_DTRACE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XSERVER_DTRACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XSERVER_DTRACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XSERVER_DTRACE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SPECIAL_DTRACE_OBJECTS_TRUE}" && test -z "${SPECIAL_DTRACE_OBJECTS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${NEED_STRLCAT_TRUE}" && test -z "${NEED_STRLCAT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_STRLCAT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_STRLCAT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"NEED_STRLCAT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${NEED_VSNPRINTF_TRUE}" && test -z "${NEED_VSNPRINTF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_VSNPRINTF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_VSNPRINTF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"NEED_VSNPRINTF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AGP_TRUE}" && test -z "${AGP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AGP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AGP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AGP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LNXAPM_TRUE}" && test -z "${LNXAPM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LNXAPM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LNXAPM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"LNXAPM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FBDEVHW_TRUE}" && test -z "${FBDEVHW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FBDEVHW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FBDEVHW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"FBDEVHW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FREEBSD_KLDLOAD_TRUE}" && test -z "${FREEBSD_KLDLOAD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FREEBSD_KLDLOAD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FREEBSD_KLDLOAD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"FREEBSD_KLDLOAD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BSD_APM_TRUE}" && test -z "${BSD_APM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_APM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BSD_APM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BSD_APM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BSD_KQUEUE_APM_TRUE}" && test -z "${BSD_KQUEUE_APM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_KQUEUE_APM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BSD_KQUEUE_APM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BSD_KQUEUE_APM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ALPHA_VIDEO_TRUE}" && test -z "${ALPHA_VIDEO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ALPHA_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ALPHA_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ALPHA_VIDEO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ARM_VIDEO_TRUE}" && test -z "${ARM_VIDEO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ARM_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ARM_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ARM_VIDEO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${I386_VIDEO_TRUE}" && test -z "${I386_VIDEO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"I386_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"I386_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"I386_VIDEO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PPC_VIDEO_TRUE}" && test -z "${PPC_VIDEO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PPC_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PPC_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"PPC_VIDEO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SPARC64_VIDEO_TRUE}" && test -z "${SPARC64_VIDEO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SPARC64_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SPARC64_VIDEO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SPARC64_VIDEO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INSTALL_SETUID_TRUE}" && test -z "${INSTALL_SETUID_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_SETUID\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INSTALL_SETUID\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INSTALL_SETUID\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SECURE_RPC_TRUE}" && test -z "${SECURE_RPC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SECURE_RPC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SECURE_RPC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SECURE_RPC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INT10_VM86_TRUE}" && test -z "${INT10_VM86_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_VM86\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INT10_VM86\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INT10_VM86\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INT10_X86EMU_TRUE}" && test -z "${INT10_X86EMU_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_X86EMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INT10_X86EMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INT10_X86EMU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INT10_STUB_TRUE}" && test -z "${INT10_STUB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_STUB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INT10_STUB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INT10_STUB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDDOCS_TRUE}" && test -z "${BUILDDOCS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDDOCS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILDDOCS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BUILDDOCS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BUILD_LINUXDOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BUILD_PDFDOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INSTALL_LIBXF86CONFIG_TRUE}" && test -z "${INSTALL_LIBXF86CONFIG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INSTALL_LIBXF86CONFIG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_DBUS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CONFIG_DBUS_API_TRUE}" && test -z "${CONFIG_DBUS_API_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_DBUS_API\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CONFIG_DBUS_API\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"CONFIG_DBUS_API\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CONFIG_HAL_TRUE}" && test -z "${CONFIG_HAL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_HAL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CONFIG_HAL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"CONFIG_HAL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CONFIG_NEED_DBUS_TRUE}" && test -z "${CONFIG_NEED_DBUS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_NEED_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CONFIG_NEED_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"CONFIG_NEED_DBUS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XV_TRUE}" && test -z "${XV_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XV\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XV\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XVMC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XVMC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XREGISTRY_TRUE}" && test -z "${XREGISTRY_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XREGISTRY\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XREGISTRY\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XREGISTRY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${COMPOSITE_TRUE}" && test -z "${COMPOSITE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"COMPOSITE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"COMPOSITE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"COMPOSITE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MITSHM_TRUE}" && test -z "${MITSHM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MITSHM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MITSHM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MITSHM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RECORD_TRUE}" && test -z "${RECORD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"RECORD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"RECORD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"RECORD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SCREENSAVER_TRUE}" && test -z "${SCREENSAVER_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SCREENSAVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SCREENSAVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SCREENSAVER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RES_TRUE}" && test -z "${RES_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"RES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"RES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"RES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GLX_TRUE}" && test -z "${GLX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"GLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GLX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AIGLX_TRUE}" && test -z "${AIGLX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AIGLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AIGLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AIGLX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DRI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DRI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DRI2_TRUE}" && test -z "${DRI2_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DRI2\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DRI2\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DRI2_AIGLX_TRUE}" && test -z "${DRI2_AIGLX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2_AIGLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DRI2_AIGLX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DRI2_AIGLX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XINERAMA_TRUE}" && test -z "${XINERAMA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XINERAMA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XINERAMA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XINERAMA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XACE_TRUE}" && test -z "${XACE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XACE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XSELINUX_TRUE}" && test -z "${XSELINUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XSELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XSELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XSELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XCSECURITY_TRUE}" && test -z "${XCSECURITY_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XCSECURITY\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XCSECURITY\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XCSECURITY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MULTIBUFFER_TRUE}" && test -z "${MULTIBUFFER_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MULTIBUFFER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MULTIBUFFER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MULTIBUFFER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DBE_TRUE}" && test -z "${DBE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DBE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DBE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DBE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XF86BIGFONT_TRUE}" && test -z "${XF86BIGFONT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XF86BIGFONT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XF86BIGFONT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XF86BIGFONT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DPMSExtension_TRUE}" && test -z "${DPMSExtension_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DPMSExtension\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DPMSExtension\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DPMSExtension\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XCALIBRATE_TRUE}" && test -z "${XCALIBRATE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XCALIBRATE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XCALIBRATE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XCALIBRATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XF86UTILS_TRUE}" && test -z "${XF86UTILS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XF86UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XF86UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XF86UTILS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XAA_TRUE}" && test -z "${XAA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XAA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XAA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XAA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${VGAHW_TRUE}" && test -z "${VGAHW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"VGAHW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"VGAHW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"VGAHW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${VBE_TRUE}" && test -z "${VBE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"VBE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"VBE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"VBE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INT10MODULE_TRUE}" && test -z "${INT10MODULE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INT10MODULE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INT10MODULE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INT10MODULE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XDMCP_TRUE}" && test -z "${XDMCP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XDMCP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XDMCP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XDMCP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XDMAUTH_TRUE}" && test -z "${XDMAUTH_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XDMAUTH\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XDMAUTH\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XDMAUTH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${UNITTESTS_TRUE}" && test -z "${UNITTESTS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"UNITTESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"UNITTESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"UNITTESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XVFB_TRUE}" && test -z "${XVFB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XVFB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XVFB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XVFB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XNEST_TRUE}" && test -z "${XNEST_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XNEST\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XNEST\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XNEST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XORG_TRUE}" && test -z "${XORG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XORG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XORG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XORG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XORG_BUS_LINUXPCI_TRUE}" && test -z "${XORG_BUS_LINUXPCI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_LINUXPCI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XORG_BUS_LINUXPCI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XORG_BUS_LINUXPCI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XORG_BUS_BSDPCI_TRUE}" && test -z "${XORG_BUS_BSDPCI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_BSDPCI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XORG_BUS_BSDPCI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XORG_BUS_BSDPCI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XORG_BUS_SPARC_TRUE}" && test -z "${XORG_BUS_SPARC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_SPARC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XORG_BUS_SPARC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XORG_BUS_SPARC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LINUX_IA64_TRUE}" && test -z "${LINUX_IA64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_IA64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LINUX_IA64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"LINUX_IA64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LINUX_ALPHA_TRUE}" && test -z "${LINUX_ALPHA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_ALPHA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LINUX_ALPHA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"LINUX_ALPHA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LNXACPI_TRUE}" && test -z "${LNXACPI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LNXACPI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LNXACPI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"LNXACPI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SOLARIS_ASM_INLINE_TRUE}" && test -z "${SOLARIS_ASM_INLINE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_ASM_INLINE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SOLARIS_ASM_INLINE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SOLARIS_ASM_INLINE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SOLARIS_VT_TRUE}" && test -z "${SOLARIS_VT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_VT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SOLARIS_VT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SOLARIS_VT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DGA_TRUE}" && test -z "${DGA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DGA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DGA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DGA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XF86VIDMODE_TRUE}" && test -z "${XF86VIDMODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XF86VIDMODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XF86VIDMODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XF86VIDMODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_TRUE}" && test -z "${XWIN_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_MULTIWINDOW_TRUE}" && test -z "${XWIN_MULTIWINDOW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_MULTIWINDOW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_MULTIWINDOWEXTWM_TRUE}" && test -z "${XWIN_MULTIWINDOWEXTWM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_CLIPBOARD_TRUE}" && test -z "${XWIN_CLIPBOARD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_CLIPBOARD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_CLIPBOARD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_CLIPBOARD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_GLX_WINDOWS_TRUE}" && test -z "${XWIN_GLX_WINDOWS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_GLX_WINDOWS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_GLX_WINDOWS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_GLX_WINDOWS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_NATIVEGDI_TRUE}" && test -z "${XWIN_NATIVEGDI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_NATIVEGDI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_NATIVEGDI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_NATIVEGDI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_PRIMARYFB_TRUE}" && test -z "${XWIN_PRIMARYFB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_PRIMARYFB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_PRIMARYFB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_PRIMARYFB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_RANDR_TRUE}" && test -z "${XWIN_RANDR_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_RANDR\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_RANDR\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_RANDR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XWIN_XV_TRUE}" && test -z "${XWIN_XV_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_XV\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XWIN_XV\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XWIN_XV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepOBJC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepOBJC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XQUARTZ_TRUE}" && test -z "${XQUARTZ_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XQUARTZ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XQUARTZ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XQUARTZ_SPARKLE_TRUE}" && test -z "${XQUARTZ_SPARKLE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ_SPARKLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XQUARTZ_SPARKLE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XQUARTZ_SPARKLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${STANDALONE_XPBPROXY_TRUE}" && test -z "${STANDALONE_XPBPROXY_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"STANDALONE_XPBPROXY\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"STANDALONE_XPBPROXY\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"STANDALONE_XPBPROXY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DMX_TRUE}" && test -z "${DMX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DMX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DMX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DMX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then + as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DMX_BUILD_LNX_TRUE}" && test -z "${DMX_BUILD_LNX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_LNX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DMX_BUILD_LNX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DMX_BUILD_LNX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DMX_BUILD_USB_TRUE}" && test -z "${DMX_BUILD_USB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_USB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DMX_BUILD_USB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"DMX_BUILD_USB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${KDRIVE_TRUE}" && test -z "${KDRIVE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"KDRIVE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"KDRIVE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"KDRIVELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"TSLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"TSLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"TSLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${KDRIVEVESA_TRUE}" && test -z "${KDRIVEVESA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEVESA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"KDRIVEVESA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"KDRIVEVESA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${KDRIVEFBDEV_TRUE}" && test -z "${KDRIVEFBDEV_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEFBDEV\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"KDRIVEFBDEV\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${XSDLSERVER_TRUE}" && test -z "${XSDLSERVER_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XSDLSERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XSDLSERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"KDRIVEFBDEV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XEPHYR_TRUE}" && test -z "${XEPHYR_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XEPHYR\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XEPHYR\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XEPHYR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_KDRIVEFBDEVLIB_TRUE}" && test -z "${BUILD_KDRIVEFBDEVLIB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${XFAKESERVER_TRUE}" && test -z "${XFAKESERVER_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"XFAKESERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"XFAKESERVER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"XFAKESERVER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -31569,17 +22692,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -31587,23 +22711,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -31611,7 +22727,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -31622,7 +22744,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -31645,13 +22767,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -31661,15 +22776,15 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -31681,12 +22796,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -31698,7 +22817,89 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -31712,8 +22913,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -31733,76 +22938,25 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -31831,8 +22985,56 @@ 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 () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -31851,10 +23053,10 @@ else if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -31869,13 +23071,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.7.0.902, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by xorg-server $as_me 1.7.99.1, which was +generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -31907,10 +23115,11 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit @@ -31932,16 +23141,16 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.7.0.902 -configured by $0, generated by GNU Autoconf 2.63, +xorg-server config.status 1.7.99.1 +configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -31984,20 +23193,19 @@ do case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -32005,11 +23213,10 @@ Try \`$0 --help' for more information." >&2 ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -32316,8 +23523,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "shave") CONFIG_FILES="$CONFIG_FILES shave" ;; - "shave-libtool") CONFIG_FILES="$CONFIG_FILES shave-libtool" ;; "include/do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/do-not-use-config.h" ;; "include/xorg-server.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xorg-server.h" ;; "include/dix-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/dix-config.h" ;; @@ -32413,15 +23618,12 @@ do "hw/kdrive/fake/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fake/Makefile" ;; "hw/kdrive/fbdev/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fbdev/Makefile" ;; "hw/kdrive/linux/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/linux/Makefile" ;; - "hw/kdrive/sdl/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/sdl/Makefile" ;; "hw/kdrive/src/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/src/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;; "xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -32448,7 +23650,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -32459,11 +23661,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -32471,10 +23669,16 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -32488,24 +23692,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -32594,9 +23792,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), @@ -32637,9 +23833,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -32724,9 +23918,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -32739,9 +23931,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -32769,12 +23959,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -32785,7 +23973,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -32798,9 +23986,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -32828,47 +24014,7 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -32925,7 +24071,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -32935,12 +24080,11 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -32950,7 +24094,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -32979,14 +24123,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} @@ -32996,9 +24138,7 @@ which seems to be undefined. Please make sure it is defined." >&2;} -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -33009,25 +24149,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -33065,7 +24199,7 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -33160,47 +24294,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -33853,15 +24947,12 @@ _LT_EOF done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -33882,10 +24973,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 27701158f..463b7103f 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,21 +26,15 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.7.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2009-10-19" +AC_INIT([xorg-server], 1.7.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2009-10-22)" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -AC_CONFIG_FILES([ - shave - shave-libtool -]) - -# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and -# XORG_CWARNFLAGS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. @@ -79,6 +73,11 @@ AC_SYS_LARGEFILE XORG_PROG_RAWCPP AC_PATH_PROG(SED,sed) +XORG_DEFAULT_OPTIONS +# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow +# easier overrides at build time. +XSERVER_CFLAGS='$(CWARNFLAGS)' + dnl Check for dtrace program (needed to build Xserver dtrace probes) dnl Also checks for , since some Linux distros have an dnl ISDN trace program named dtrace @@ -424,7 +423,6 @@ case $host_os in ;; esac -XORG_RELEASE_VERSION dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the dnl major number PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` @@ -444,8 +442,9 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRIN dnl Build options. AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], - [Treat warnings as errors (default: disabled)]), - [WERROR=$enableval], [WERROR=no]) + [Obsolete - use --enable-strict-compilation instead]), + AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation])) + AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debugging (default: disabled)]), [DEBUGGING=$enableval], [DEBUGGING=no]) @@ -617,7 +616,6 @@ AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server dnl kdrive and its subsystems AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) -AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto]) AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto]) @@ -654,7 +652,7 @@ dnl If you're seeing an error here, be sure you installed the lib/xtrans module dnl first and if it's not in the default location, that you set the ACLOCAL dnl environment variable to find it, such as: dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" -m4_pattern_forbid(XTRANS_CONNECTION_FLAGS) +m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS @@ -1091,11 +1089,16 @@ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes) AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) -AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir]) +AC_ARG_WITH(xkb-bin-directory, + AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]), + [XKB_BIN_DIRECTORY="$withval"], + [XKB_BIN_DIRECTORY="$bindir"]) + +AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` -if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then +if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" fi @@ -1320,7 +1323,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers # require. # -XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" +XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" AC_SUBST([XSERVER_LIBS]) @@ -1333,14 +1336,9 @@ AC_SUBST([UTILS_SYS_LIBS]) # Some platforms require extra flags to do this. gcc should set these flags # when -rdynamic is passed to it, other compilers/linkers may need to be added # here. -XORG_CWARNFLAGS if test "x$GCC" = "xyes"; then - if test "x$WERROR" = "xyes"; then - CWARNFLAGS="${CWARNFLAGS} -Werror" - fi LD_EXPORT_SYMBOLS_FLAG="-rdynamic" fi -XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS" case $host_os in openbsd*) LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" @@ -1818,6 +1816,8 @@ fi AC_MSG_RESULT([$DMX]) AM_CONDITIONAL(DMX, [test "x$DMX" = xyes]) +DOXYGEN="not_found" + if test "x$DMX" = xyes; then if test "x$have_dmx" = xno; then AC_MSG_ERROR([Xdmx build explicitly requested, but required @@ -1852,7 +1852,14 @@ dnl Linux sources in DMX require AC_SUBST(XRESEXAMPLES_DEP_LIBS) PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11]) AC_SUBST(X11EXAMPLES_DEP_LIBS) + fi +AC_PATH_PROG(DOXYGEN,doxygen,[not_found]) +if test "x$DOXYGEN" = "xnot_found" ; then + AC_MSG_WARN([doxygen not found in $PATH. Cannot build dmx documentation]) +fi +AC_SUBST(DOXYGEN) +AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"]) AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes]) AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes]) @@ -1860,9 +1867,6 @@ dnl kdrive DDX XEPHYR_LIBS= XEPHYR_INCS= -XSDL_LIBS= -XSDL_INCS= -XSDL_DIRS= AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) if test "$KDRIVE" = yes; then @@ -1907,18 +1911,6 @@ if test "$KDRIVE" = yes; then fi fi - AC_CHECK_HEADERS([SDL/SDL.h]) - if test x"$ac_cv_header_SDL_SDL_h" = xyes && test "x$XSDL" = xauto; then - XSDL=yes - fi - - if test x"$XSDL" = xyes; then - # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES) - AC_DEFINE(XSDLSERVER,1,[Build Xsdl server]) - XSDL_LIBS="`sdl-config --libs`" - XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS" - fi - XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp" if test "x$XV" = xyes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" @@ -1960,8 +1952,6 @@ if test "$KDRIVE" = yes; then AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) - AC_SUBST([XSDL_LIBS]) - AC_SUBST([XSDL_INCS]) fi AC_SUBST([KDRIVE_INCS]) AC_SUBST([KDRIVE_PURE_INCS]) @@ -1973,7 +1963,6 @@ AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) AM_CONDITIONAL(KDRIVEVESA, [test "x$KDRIVEVESA" = xyes]) AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes]) -AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes]) AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes]) AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes]) @@ -2007,12 +1996,6 @@ AC_SUBST([libdir]) AC_SUBST([exec_prefix]) AC_SUBST([prefix]) -# Man page sections - used in config utils & generating man pages -XORG_MANPAGE_SECTIONS -XORG_CHANGELOG - -SHAVE_INIT([.], [enable]) - AC_OUTPUT([ Makefile glx/Makefile @@ -2099,7 +2082,6 @@ hw/kdrive/ephyr/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile -hw/kdrive/sdl/Makefile hw/kdrive/src/Makefile test/Makefile test/xi2/Makefile diff --git a/xorg-server/cpprules.in b/xorg-server/cpprules.in index 755620005..7fcb9bd6f 100644 --- a/xorg-server/cpprules.in +++ b/xorg-server/cpprules.in @@ -42,7 +42,7 @@ MANDEFS = \ -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/xorg-server/damageext/Makefile.in b/xorg-server/damageext/Makefile.in index 76a6e8e22..5b0ef2380 100644 --- a/xorg-server/damageext/Makefile.in +++ b/xorg-server/damageext/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -243,7 +240,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -257,7 +253,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -343,6 +336,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -374,7 +368,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/dbe/Makefile.in b/xorg-server/dbe/Makefile.in index 7d2e3821c..e1af4098a 100644 --- a/xorg-server/dbe/Makefile.in +++ b/xorg-server/dbe/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -269,7 +266,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -283,7 +279,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -369,6 +362,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -400,7 +394,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/dix/Makefile.am b/xorg-server/dix/Makefile.am index 1caa5d024..b29f2e189 100644 --- a/xorg-server/dix/Makefile.am +++ b/xorg-server/dix/Makefile.am @@ -51,7 +51,7 @@ if XSERVER_DTRACE BUILT_SOURCES = Xserver-dtrace.h Xserver-dtrace.h: $(srcdir)/Xserver.d - $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ + $(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ || cp Xserver-dtrace.h.in $@ endif @@ -59,12 +59,12 @@ endif if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libdix dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) - $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) + $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) - ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) + $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif dix.c: diff --git a/xorg-server/dix/Makefile.in b/xorg-server/dix/Makefile.in index f4e983f3b..c302e845f 100644 --- a/xorg-server/dix/Makefile.in +++ b/xorg-server/dix/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -135,7 +135,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -160,7 +159,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -184,6 +182,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -201,8 +200,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -248,7 +245,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -274,6 +270,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -283,7 +280,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -297,7 +293,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -339,8 +334,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -383,6 +376,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -414,7 +408,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -830,15 +823,15 @@ uninstall-am: uninstall-dist_miscconfigDATA @XSERVER_DTRACE_TRUE@Xserver-dtrace.h: $(srcdir)/Xserver.d -@XSERVER_DTRACE_TRUE@ $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ +@XSERVER_DTRACE_TRUE@ $(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ @XSERVER_DTRACE_TRUE@ || cp Xserver-dtrace.h.in $@ # Generate dtrace object code for probes in libdix @SPECIAL_DTRACE_OBJECTS_TRUE@dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) -@SPECIAL_DTRACE_OBJECTS_TRUE@ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) +@SPECIAL_DTRACE_OBJECTS_TRUE@ $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) @SPECIAL_DTRACE_OBJECTS_TRUE@dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) -@SPECIAL_DTRACE_OBJECTS_TRUE@ ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) +@SPECIAL_DTRACE_OBJECTS_TRUE@ $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) dix.c: touch $@ diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index e86e606c0..6a7907399 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -2221,12 +2221,15 @@ ProcQueryKeymap(ClientPtr client) rep.length = 2; rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess); - if (rc != Success) + if (rc != Success && rc != BadAccess) return rc; for (i = 0; i<32; i++) rep.map[i] = down[i]; + if (rc == BadAccess) + memset(rep.map, 0, 32); + WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep); return Success; diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c index 5cede5f43..8278d444b 100644 --- a/xorg-server/dix/dixutils.c +++ b/xorg-server/dix/dixutils.c @@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source) } -void -CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) -{ - int i; - - for (i = 0; i < length; i++, source++, dest++) - *dest = ISOLatin1ToLower (*source); - *dest = '\0'; -} - int CompareISOLatin1Lowered(unsigned char *s1, int s1len, unsigned char *s2, int s2len) diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 8f63d3381..d070a4c6f 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1462,7 +1462,7 @@ static DevPrivateKey GrabPrivateKey = &GrabPrivateKeyIndex; static void DetachFromMaster(DeviceIntPtr dev) { - int id; + intptr_t id; if (!dev->u.master) return; @@ -1484,7 +1484,7 @@ ReattachToOldMaster(DeviceIntPtr dev) p = dixLookupPrivate(&dev->devPrivates, GrabPrivateKey); - id = (int)p; /* silence gcc warnings */ + id = (intptr_t) p; /* silence gcc warnings */ dixLookupDevice(&master, id, serverClient, DixUseAccess); if (master) @@ -2507,9 +2507,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab, filter, grab); if (deliveries > 0) goto unwind; - } else if (rc != BadMatch) - ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n", - dev->name, event->any.type, rc); + } } /* Core event */ @@ -2525,9 +2523,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab, filter, grab); if (deliveries > 0) goto unwind; - } else if (rc != BadMatch) - ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n", - dev->name, event->any.type, rc); + } } if ((deliveries < 0) || (pWin == stopAt) || @@ -3811,9 +3807,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window) deliveries = DeliverEventsToWindow(keybd, focus, &core, 1, GetEventFilter(keybd, &core), NullGrab); - } else if (rc != BadMatch) - ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n", - keybd->name, event->any.type, rc); + } } unwind: @@ -4974,7 +4968,7 @@ ProcQueryPointer(ClientPtr client) if (rc != Success) return rc; rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess); - if (rc != Success) + if (rc != Success && rc != BadAccess) return rc; keyboard = GetPairedDevice(mouse); @@ -5022,6 +5016,15 @@ ProcQueryPointer(ClientPtr client) } #endif + if (rc == BadAccess) { + rep.mask = 0; + rep.child = None; + rep.rootX = 0; + rep.rootY = 0; + rep.winX = 0; + rep.winY = 0; + } + WriteReplyToClient(client, sizeof(xQueryPointerReply), &rep); return(Success); diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index 3a2deb85c..e3e727462 100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c @@ -303,6 +303,7 @@ dixResetPrivates(void) /* reset private descriptors */ for (i = 1; i < nextPriv; i++) { *items[i].key = 0; + items[i].size = 0; DeleteCallbackList(&items[i].initfuncs); DeleteCallbackList(&items[i].deletefuncs); } diff --git a/xorg-server/doc/Makefile.in b/xorg-server/doc/Makefile.in index 37b50f67c..8d6cb6e44 100644 --- a/xorg-server/doc/Makefile.in +++ b/xorg-server/doc/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -246,7 +243,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -260,7 +256,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -346,6 +339,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -377,7 +371,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -679,10 +672,10 @@ uninstall-am: uninstall-appmanDATA uninstall-filemanDATA .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): cp $< $@ diff --git a/xorg-server/exa/Makefile.in b/xorg-server/exa/Makefile.in index bc0a6c903..ac8351121 100644 --- a/xorg-server/exa/Makefile.in +++ b/xorg-server/exa/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -271,7 +268,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -288,7 +284,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -330,8 +325,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -374,6 +367,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -405,7 +399,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c index e264d440c..46e91820b 100644 --- a/xorg-server/exa/exa.c +++ b/xorg-server/exa/exa.c @@ -774,10 +774,18 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout, ScreenPtr pScreen = screenInfo.screens[screenNum]; ExaScreenPriv(pScreen); + /* Move any deferred results from a software fallback to the driver pixmap */ + if (pExaScr->deferred_mixed_pixmap) + exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap); + unwrap(pExaScr, pScreen, BlockHandler); (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask); wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler); + /* The rest only applies to classic EXA */ + if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS) + return; + /* Try and keep the offscreen memory area tidy every now and then (at most * once per second) when the server has been idle for at least 100ms. */ @@ -991,10 +999,12 @@ exaDriverInit (ScreenPtr pScreen, * Replace various fb screen functions */ if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) && - !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) { + (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) || + (pExaScr->info->flags & EXA_MIXED_PIXMAPS))) wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler); + if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) && + !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler); - } wrap(pExaScr, pScreen, CreateGC, exaCreateGC); wrap(pExaScr, pScreen, CloseScreen, exaCloseScreen); wrap(pExaScr, pScreen, GetImage, exaGetImage); diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c index bf097c32f..5a370047e 100644 --- a/xorg-server/exa/exa_glyphs.c +++ b/xorg-server/exa/exa_glyphs.c @@ -62,15 +62,10 @@ */ #define CACHE_PICTURE_WIDTH 1024 -/* Maximum number of glyphs we buffer on the stack before flushing - * rendering to the mask or destination surface. - */ -#define GLYPH_BUFFER_SIZE 256 - typedef struct { PicturePtr mask; - ExaCompositeRectRec rects[GLYPH_BUFFER_SIZE]; int count; + ExaCompositeRectRec rects[0]; } ExaGlyphBuffer, *ExaGlyphBufferPtr; typedef enum { @@ -364,7 +359,8 @@ exaGlyphCacheHashRemove(ExaGlyphCachePtr cache, static void exaGlyphCacheUploadGlyph(ScreenPtr pScreen, ExaGlyphCachePtr cache, - int pos, + int x, + int y, GlyphPtr pGlyph) { ExaScreenPriv(pScreen); @@ -399,10 +395,10 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen, if (!exaPixmapIsOffscreen(pCachePixmap)) goto composite; - /* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */ + /* x,y are in pixmap coordinates, no need for cache{X,Y}off */ if (pExaScr->info->UploadToScreen(pCachePixmap, - CACHE_X(pos), - CACHE_Y(pos), + x, + y, pGlyph->info.width, pGlyph->info.height, (char *)pExaPixmap->sys_ptr, @@ -416,18 +412,18 @@ composite: cache->picture, 0, 0, 0, 0, - CACHE_X(pos), - CACHE_Y(pos), + x, + y, pGlyph->info.width, pGlyph->info.height); damage: /* The cache pixmap isn't a window, so no need to offset coordinates. */ exaPixmapDirty (pCachePixmap, - CACHE_X(pos), - CACHE_Y(pos), - CACHE_X(pos) + cache->glyphWidth, - CACHE_Y(pos) + cache->glyphHeight); + x, + y, + x + cache->glyphWidth, + y + cache->glyphHeight); } static ExaGlyphCacheResult @@ -446,6 +442,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, { ExaCompositeRectPtr rect; int pos; + int x, y; if (buffer->mask && buffer->mask != cache->picture) return ExaGlyphNeedFlush; @@ -462,10 +459,14 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, pos = exaGlyphCacheHashLookup(cache, pGlyph); if (pos != -1) { DBG_GLYPH_CACHE((" found existing glyph at %d\n", pos)); + x = CACHE_X(pos); + y = CACHE_Y(pos); } else { if (cache->glyphCount < cache->size) { /* Space remaining; we fill from the start */ pos = cache->glyphCount; + x = CACHE_X(pos); + y = CACHE_Y(pos); cache->glyphCount++; DBG_GLYPH_CACHE((" storing glyph in free space at %d\n", pos)); @@ -477,14 +478,12 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, * the cache */ pos = cache->evictionPosition; + x = CACHE_X(pos); + y = CACHE_Y(pos); DBG_GLYPH_CACHE((" evicting glyph at %d\n", pos)); if (buffer->count) { - int x, y; int i; - x = CACHE_X(pos); - y = CACHE_Y(pos); - for (i = 0; i < buffer->count; i++) { if (pSrc ? (buffer->rects[i].xMask == x && buffer->rects[i].yMask == y) : @@ -503,7 +502,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, cache->evictionPosition = rand() % cache->size; } - exaGlyphCacheUploadGlyph(pScreen, cache, pos, pGlyph); + exaGlyphCacheUploadGlyph(pScreen, cache, x, y, pGlyph); } buffer->mask = cache->picture; @@ -514,13 +513,13 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen, { rect->xSrc = xSrc; rect->ySrc = ySrc; - rect->xMask = CACHE_X(pos); - rect->yMask = CACHE_Y(pos); + rect->xMask = x; + rect->yMask = y; } else { - rect->xSrc = CACHE_X(pos); - rect->ySrc = CACHE_Y(pos); + rect->xSrc = x; + rect->ySrc = y; rect->xMask = 0; rect->yMask = 0; } @@ -553,16 +552,13 @@ exaBufferGlyph(ScreenPtr pScreen, INT16 yDst) { ExaScreenPriv(pScreen); - unsigned int format = (GlyphPicture(pGlyph)[pScreen->myNum])->format; + PicturePtr mask = GlyphPicture(pGlyph)[pScreen->myNum]; + unsigned int format = mask->format; int width = pGlyph->info.width; int height = pGlyph->info.height; ExaCompositeRectPtr rect; - PicturePtr mask; int i; - if (buffer->count == GLYPH_BUFFER_SIZE) - return ExaGlyphNeedFlush; - if (PICT_FORMAT_BPP(format) == 1) format = PICT_a8; @@ -593,7 +589,6 @@ exaBufferGlyph(ScreenPtr pScreen, /* Couldn't find the glyph in the cache, use the glyph picture directly */ - mask = GlyphPicture(pGlyph)[pScreen->myNum]; if (buffer->mask && buffer->mask != mask) return ExaGlyphNeedFlush; @@ -707,12 +702,18 @@ exaGlyphs (CARD8 op, int width = 0, height = 0; int x, y; int first_xOff = list->xOff, first_yOff = list->yOff; - int n; + int i, n; GlyphPtr glyph; int error; BoxRec extents = {0, 0, 0, 0}; CARD32 component_alpha; - ExaGlyphBuffer buffer; + ExaGlyphBufferPtr buffer; + + for (i = 0, n = 0; i < nlist; i++) + n += list[i].len; + buffer = alloca(sizeof(ExaGlyphBuffer) + n * sizeof(ExaCompositeRectRec)); + if (!buffer) + return; if (maskFormat) { @@ -792,8 +793,8 @@ exaGlyphs (CARD8 op, x = 0; y = 0; } - buffer.count = 0; - buffer.mask = NULL; + buffer->count = 0; + buffer->mask = NULL; while (nlist--) { x += list->xOff; @@ -808,23 +809,23 @@ exaGlyphs (CARD8 op, /* pGlyph->info.{x,y} compensate for empty space in the glyph. */ if (maskFormat) { - if (exaBufferGlyph(pScreen, &buffer, glyph, NULL, pMask, + if (exaBufferGlyph(pScreen, buffer, glyph, NULL, pMask, 0, 0, 0, 0, x - glyph->info.x, y - glyph->info.y) == ExaGlyphNeedFlush) { - exaGlyphsToMask(pMask, &buffer); - exaBufferGlyph(pScreen, &buffer, glyph, NULL, pMask, + exaGlyphsToMask(pMask, buffer); + exaBufferGlyph(pScreen, buffer, glyph, NULL, pMask, 0, 0, 0, 0, x - glyph->info.x, y - glyph->info.y); } } else { - if (exaBufferGlyph(pScreen, &buffer, glyph, pSrc, pDst, + if (exaBufferGlyph(pScreen, buffer, glyph, pSrc, pDst, xSrc + (x - glyph->info.x) - first_xOff, ySrc + (y - glyph->info.y) - first_yOff, 0, 0, x - glyph->info.x, y - glyph->info.y) == ExaGlyphNeedFlush) { - exaGlyphsToDst(pSrc, pDst, &buffer); - exaBufferGlyph(pScreen, &buffer, glyph, pSrc, pDst, + exaGlyphsToDst(pSrc, pDst, buffer); + exaBufferGlyph(pScreen, buffer, glyph, pSrc, pDst, xSrc + (x - glyph->info.x) - first_xOff, ySrc + (y - glyph->info.y) - first_yOff, 0, 0, x - glyph->info.x, y - glyph->info.y); } @@ -837,11 +838,11 @@ exaGlyphs (CARD8 op, list++; } - if (buffer.count) { + if (buffer->count) { if (maskFormat) - exaGlyphsToMask(pMask, &buffer); + exaGlyphsToMask(pMask, buffer); else - exaGlyphsToDst(pSrc, pDst, &buffer); + exaGlyphsToDst(pSrc, pDst, buffer); } if (maskFormat) diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c index f42c9c233..6065d7577 100644 --- a/xorg-server/exa/exa_migration_mixed.c +++ b/xorg-server/exa/exa_migration_mixed.c @@ -99,8 +99,13 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel) exaCreateDriverPixmap_mixed(pPixmap); if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) { + ExaScreenPriv(pPixmap->drawable.pScreen); + pPixmap->devKind = pExaPixmap->fb_pitch; exaCopyDirtyToFb(pixmaps + i); + + if (pExaScr->deferred_mixed_pixmap == pPixmap) + pExaScr->deferred_mixed_pixmap = NULL; } pExaPixmap->offscreen = exaPixmapIsOffscreen(pPixmap); @@ -197,6 +202,9 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg) /* Move back results of software rendering on system memory copy of mixed driver * pixmap (see exaPrepareAccessReg_mixed). + * + * Defer moving the destination back into the driver pixmap, to try and save + * overhead on multiple consequent software fallbacks. */ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index) { @@ -204,6 +212,16 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index) if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) { DamageRegionProcessPending(&pPixmap->drawable); - exaMoveInPixmap_mixed(pPixmap); + + if (index == EXA_PREPARE_DEST || index == EXA_PREPARE_AUX_DEST) { + ExaScreenPriv(pPixmap->drawable.pScreen); + + if (pExaScr->deferred_mixed_pixmap && + pExaScr->deferred_mixed_pixmap != pPixmap) + exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap); + pExaScr->deferred_mixed_pixmap = pPixmap; + pPixmap->devKind = pExaPixmap->fb_pitch; + } else + exaMoveInPixmap_mixed(pPixmap); } } diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c index 167ffa9d5..bc393c772 100644 --- a/xorg-server/exa/exa_mixed.c +++ b/xorg-server/exa/exa_mixed.c @@ -192,6 +192,9 @@ exaDestroyPixmap_mixed(PixmapPtr pPixmap) { ExaPixmapPriv (pPixmap); + if (pExaScr->deferred_mixed_pixmap == pPixmap) + pExaScr->deferred_mixed_pixmap = NULL; + if (pExaPixmap->driverPriv) pExaScr->info->DestroyPixmap(pScreen, pExaPixmap->driverPriv); pExaPixmap->driverPriv = NULL; diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h index 1aec8e966..5b056dab9 100644 --- a/xorg-server/exa/exa_priv.h +++ b/xorg-server/exa/exa_priv.h @@ -188,6 +188,7 @@ typedef struct { unsigned numOffscreenAvailable; CARD32 lastDefragment; CARD32 nextDefragment; + PixmapPtr deferred_mixed_pixmap; /* Reference counting for accessed pixmaps */ struct { diff --git a/xorg-server/fb/Makefile.in b/xorg-server/fb/Makefile.in index 195e518f1..31f5f51c7 100644 --- a/xorg-server/fb/Makefile.in +++ b/xorg-server/fb/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -151,7 +151,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -176,7 +175,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -200,6 +198,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -217,8 +216,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -264,7 +261,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -290,6 +286,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -299,7 +296,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -313,7 +309,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -355,8 +350,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -399,6 +392,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -430,7 +424,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/glx/Makefile.in b/xorg-server/glx/Makefile.in index 439f8d17b..65db3fd38 100644 --- a/xorg-server/glx/Makefile.in +++ b/xorg-server/glx/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -114,7 +114,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -139,7 +138,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -163,6 +161,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -180,8 +179,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -227,7 +224,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -253,6 +249,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -262,7 +259,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -276,7 +272,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -318,8 +313,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -362,6 +355,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -393,7 +387,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index b1061a8c2..eedab652f 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -50,7 +50,6 @@ #include "indirect_dispatch.h" #include "indirect_table.h" #include "indirect_util.h" -#include "protocol-versions.h" static int validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err) @@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc) ** client if it wants to work with older clients; however, in this ** implementation the server just returns its version number. */ - reply.majorVersion = SERVER_GLX_MAJOR_VERSION; - reply.minorVersion = SERVER_GLX_MINOR_VERSION; + reply.majorVersion = glxMajorVersion; + reply.minorVersion = glxMinorVersion; reply.length = 0; reply.type = X_Reply; reply.sequenceNumber = client->sequence; @@ -2058,7 +2057,7 @@ int __glXDisp_BindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc) if (ret == Success) { if (barrier) /* add source for cleanup when drawable is gone */ - AddResource(drawable, __glXSwapBarrierRes, (pointer)screen); + AddResource(drawable, __glXSwapBarrierRes, (pointer)(intptr_t)screen); else /* delete source */ FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE); @@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) char *buf; __GLXscreen *pGlxScreen; int err; + char ver_str[16]; if (!validGlxScreen(client, req->screen, &pGlxScreen, &err)) return err; @@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) ptr = pGlxScreen->GLXvendor; break; case GLX_VERSION: - ptr = pGlxScreen->GLXversion; + /* Return to the server version rather than the screen version + * to prevent confusion when they do not match. + */ + snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion); + ptr = ver_str; break; case GLX_EXTENSIONS: ptr = pGlxScreen->GLXextensions; diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index ed7fb4c4b..ed7dc80ba 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->base.GLXextensions); } + /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled + * drivers support the required extensions for GLX 1.4. The extensions + * we're assuming are: + * + * - GLX_SGI_make_current_read (1.3) + * - GLX_SGIX_fbconfig (1.3) + * - GLX_SGIX_pbuffer (1.3) + * - GLX_ARB_multisample (1.4) + */ + screen->base.GLXmajor = 1; + screen->base.GLXminor = 4; + screen->enterVT = pScrn->EnterVT; pScrn->EnterVT = glxDRIEnterVT; screen->leaveVT = pScrn->LeaveVT; diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index 19d70d495..9f9c0ed1f 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -360,12 +360,18 @@ void GlxExtensionInit(void) pScreen = screenInfo.screens[i]; for (p = __glXProviderStack; p != NULL; p = p->next) { - if (p->screenProbe(pScreen) != NULL) { + __GLXscreen *glxScreen; + + glxScreen = p->screenProbe(pScreen); + if (glxScreen != NULL) { + if (glxScreen->GLXminor < glxMinorVersion) + glxMinorVersion = glxScreen->GLXminor; LogMessage(X_INFO, "GLX: Initialized %s GL provider for screen %d\n", p->name, i); break; } + } if (!p) diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c index 7d29d31de..674e2c681 100644 --- a/xorg-server/glx/glxscreens.c +++ b/xorg-server/glx/glxscreens.c @@ -42,6 +42,7 @@ #include "glxserver.h" #include "glxutil.h" #include "glxext.h" +#include "protocol-versions.h" static int glxScreenPrivateKeyIndex; static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex; @@ -162,7 +163,8 @@ static const char GLServerExtensions[] = ** supported across all screens in a multi-screen system. */ static char GLXServerVendorName[] = "SGI"; -static char GLXServerVersion[] = "1.2"; +unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; +unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; static char GLXServerExtensions[] = "GLX_ARB_multisample " "GLX_EXT_visual_info " @@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) pGlxScreen->pScreen = pScreen; pGlxScreen->GLextensions = xstrdup(GLServerExtensions); pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName); - pGlxScreen->GLXversion = xstrdup(GLXServerVersion); pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions); + /* All GLX providers must support all of the functionality required for at + * least GLX 1.2. If the provider supports a higher version, the GLXminor + * version can be changed in the provider's screen-probe routine. For + * most providers, the screen-probe routine is the caller of this + * function. + */ + pGlxScreen->GLXmajor = 1; + pGlxScreen->GLXminor = 2; + pGlxScreen->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = glxCloseScreen; pGlxScreen->DestroyWindow = pScreen->DestroyWindow; @@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) void __glXScreenDestroy(__GLXscreen *screen) { xfree(screen->GLXvendor); - xfree(screen->GLXversion); xfree(screen->GLXextensions); xfree(screen->GLextensions); } diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h index 3c1bdd4ba..bff436307 100644 --- a/xorg-server/glx/glxscreens.h +++ b/xorg-server/glx/glxscreens.h @@ -161,6 +161,17 @@ struct __GLXscreen { char *GLXversion; char *GLXextensions; + /** + * \name GLX version supported by this screen. + * + * Since the GLX version advertised by the server is for the whole server, + * the GLX protocol code uses the minimum version supported on all screens. + */ + /*@{*/ + unsigned GLXmajor; + unsigned GLXminor; + /*@}*/ + Bool (*CloseScreen)(int index, ScreenPtr pScreen); Bool (*DestroyWindow)(WindowPtr pWindow); }; diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h index 4aa8c2eec..80f1b28f9 100644 --- a/xorg-server/glx/glxserver.h +++ b/xorg-server/glx/glxserver.h @@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type, GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows, GLint alignment); +extern unsigned glxMajorVersion; +extern unsigned glxMinorVersion; + #endif /* !__GLX_server_h__ */ diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 25c6eb30e..5f44d7b1a 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p const GLenum target = *(GLenum *)(pc + 0); const GLint level = *(GLint *)(pc + 4); GLint compsize = 0; - char *answer, answerBuffer[200]; + char *answer = NULL, answerBuffer[200]; CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); @@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) ); const GLint level = (GLint ) bswap_32( *(int *)(pc + 4) ); GLint compsize = 0; - char *answer, answerBuffer[200]; + char *answer = NULL, answerBuffer[200]; CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); diff --git a/xorg-server/hw/Makefile.in b/xorg-server/hw/Makefile.in index 4048e026c..67d0c8d80 100644 --- a/xorg-server/hw/Makefile.in +++ b/xorg-server/hw/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -108,7 +108,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -133,7 +132,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -157,6 +155,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -174,8 +173,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -221,7 +218,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -247,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -256,7 +253,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -270,7 +266,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -312,8 +307,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -356,6 +349,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -387,7 +381,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/Makefile.in b/xorg-server/hw/dmx/Makefile.in index accf378dd..84b6fec10 100644 --- a/xorg-server/hw/dmx/Makefile.in +++ b/xorg-server/hw/dmx/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -184,7 +184,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -209,7 +208,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -233,6 +231,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -250,8 +249,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -297,7 +294,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -323,6 +319,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -332,7 +329,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -346,7 +342,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -397,8 +392,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -441,6 +434,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -472,7 +466,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/config/Makefile.in b/xorg-server/hw/dmx/config/Makefile.in index ff7d509e3..00a11b4b2 100644 --- a/xorg-server/hw/dmx/config/Makefile.in +++ b/xorg-server/hw/dmx/config/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -157,7 +157,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -182,7 +181,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -206,6 +204,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -223,8 +222,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -270,7 +267,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -296,6 +292,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -305,7 +302,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -319,7 +315,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -361,8 +356,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -405,6 +398,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -436,7 +430,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/config/dmxconfig.c b/xorg-server/hw/dmx/config/dmxconfig.c index 225d89277..a31e5f7f7 100644 --- a/xorg-server/hw/dmx/config/dmxconfig.c +++ b/xorg-server/hw/dmx/config/dmxconfig.c @@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void) return (char *)(dmx##glob ? dmx##glob : def); \ } -GEN(rules, XkbRules, DMX_DEFAULT_XKB_RULES) -GEN(model, XkbModel, DMX_DEFAULT_XKB_MODEL) -GEN(layout, XkbLayout, DMX_DEFAULT_XKB_LAYOUT) -GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT) -GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS) - +GEN(rules, XkbRules, XKB_DFLT_RULES) +GEN(model, XkbModel, XKB_DFLT_MODEL) +GEN(layout, XkbLayout, XKB_DFLT_LAYOUT) +GEN(variant, XkbVariant, XKB_DFLT_VARIANT) +GEN(options, XkbOptions, XKB_DFLT_OPTIONS) diff --git a/xorg-server/hw/dmx/config/dmxconfig.h b/xorg-server/hw/dmx/config/dmxconfig.h index 477db4a63..91a6662e3 100644 --- a/xorg-server/hw/dmx/config/dmxconfig.h +++ b/xorg-server/hw/dmx/config/dmxconfig.h @@ -36,11 +36,8 @@ #ifndef _DMXCONFIG_H_ #define _DMXCONFIG_H_ -#define DMX_DEFAULT_XKB_RULES "base" -#define DMX_DEFAULT_XKB_MODEL "pc101" -#define DMX_DEFAULT_XKB_LAYOUT "us" -#define DMX_DEFAULT_XKB_VARIANT NULL -#define DMX_DEFAULT_XKB_OPTIONS NULL + +#include extern void dmxConfigStoreDisplay(const char *display); extern void dmxConfigStoreInput(const char *input); /* Core devices */ diff --git a/xorg-server/hw/dmx/config/scanner.c b/xorg-server/hw/dmx/config/scanner.c index 4735aad54..7cbffab23 100644 --- a/xorg-server/hw/dmx/config/scanner.c +++ b/xorg-server/hw/dmx/config/scanner.c @@ -53,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -140,7 +141,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -544,7 +553,7 @@ static int gettoken(int token, const char *text, int leng); static int getcomment(int token, const char *text, int leng); static int lineno = 1; -#line 548 "scanner.c" +#line 557 "scanner.c" #define INITIAL 0 #define OTHER 1 @@ -626,7 +635,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -634,7 +648,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -645,7 +659,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -732,7 +746,7 @@ YY_DECL #line 62 "scanner.l" -#line 736 "scanner.c" +#line 750 "scanner.c" if ( !(yy_init) ) { @@ -922,7 +936,7 @@ YY_RULE_SETUP #line 83 "scanner.l" ECHO; YY_BREAK -#line 926 "scanner.c" +#line 940 "scanner.c" case YY_END_OF_BUFFER: { @@ -1681,8 +1695,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ diff --git a/xorg-server/hw/dmx/dmx-config.h b/xorg-server/hw/dmx/dmx-config.h index 9791dc0bc..1fda69f45 100644 --- a/xorg-server/hw/dmx/dmx-config.h +++ b/xorg-server/hw/dmx/dmx-config.h @@ -32,7 +32,7 @@ */ /** \file - * Provide configuration #define's and #undef's to build Xdmx in X.Org's + * Provide configuration define's and undef's to build Xdmx in X.Org's * modular source tree. */ diff --git a/xorg-server/hw/dmx/dmx.c b/xorg-server/hw/dmx/dmx.c index 1a0c3fea8..b8fbf02f1 100644 --- a/xorg-server/hw/dmx/dmx.c +++ b/xorg-server/hw/dmx/dmx.c @@ -37,7 +37,7 @@ * most all of the useful functions in this file are declared static and * do not appear in the doxygen documentation. * - * Much of the low-level work is done by functions in #dmxextension.c + * Much of the low-level work is done by functions in \a dmxextension.c * * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ diff --git a/xorg-server/hw/dmx/dmxcursor.c b/xorg-server/hw/dmx/dmxcursor.c index cbadf6292..37e66d758 100644 --- a/xorg-server/hw/dmx/dmxcursor.c +++ b/xorg-server/hw/dmx/dmxcursor.c @@ -339,7 +339,7 @@ static void dmxComputeScreenOrigins(void) } /** Recompute origin information in the #dmxScreens list. This is - * either called from #dmxInitOrigins() or from #dmxReconfig(). */ + * called from #dmxInitOrigins. */ void dmxReInitOrigins(void) { int i; @@ -464,7 +464,7 @@ static int dmxDoesOverlap(DMXScreenInfo *a, DMXScreenInfo *b) return 0; } -/** Used with #dmxInterateOverlap to print out a list of screens which +/** Used with \a dmxInterateOverlap to print out a list of screens which * overlap each other. */ static void *dmxPrintOverlap(DMXScreenInfo *dmxScreen, void *closure) { diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c index d367f262c..22660419c 100644 --- a/xorg-server/hw/dmx/dmxextension.c +++ b/xorg-server/hw/dmx/dmxextension.c @@ -1516,7 +1516,7 @@ static void dmxBEDestroyScratchGCs(int scrnNum) /** Destroy window hierachy on back-end server. To ensure that all * XDestroyWindow() calls succeed, they must be performed in a bottom * up order so that windows are not destroyed before their children. - * XDestroyWindow(), which is called from #dmxBEDestrowWindow(), will + * XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will * destroy a window as well as all of it's children. */ static void dmxBEDestroyWindowTree(int idx) { diff --git a/xorg-server/hw/dmx/dmxextension.h b/xorg-server/hw/dmx/dmxextension.h index 342d8c593..5a6fd0e9f 100644 --- a/xorg-server/hw/dmx/dmxextension.h +++ b/xorg-server/hw/dmx/dmxextension.h @@ -40,7 +40,7 @@ #define _DMXEXTENSION_H_ /** Screen attributes. Used by #ProcDMXGetScreenAttributes and - * #ProcDMXChangeScreenAttributes. */ + * \a ProcDMXChangeScreensAttributes. */ typedef struct { const char *displayName; int logicalScreen; @@ -59,7 +59,7 @@ typedef struct { int rootWindowYorigin; /* global coordinate system */ } DMXScreenAttributesRec, *DMXScreenAttributesPtr; -/** Window attributes. Used by #ProcDMXGetWidowAttributes. */ +/** Window attributes. Used by #ProcDMXGetWindowAttributes. */ typedef struct { int screen; Window window; diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index e5598e331..f481cf5c9 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/hw/dmx/dmxinit.c @@ -846,6 +846,12 @@ void AbortDDX(void) } } +#ifdef DDXBEFORERESET +void ddxBeforeReset(void) +{ +} +#endif + /** This function is called in Xserver/dix/main.c from \a main() when * dispatchException & DE_TERMINATE (which is the only way to exit the * main loop without an interruption. */ diff --git a/xorg-server/hw/dmx/dmxinput.c b/xorg-server/hw/dmx/dmxinput.c index 5203e1a8f..d9118b6a0 100644 --- a/xorg-server/hw/dmx/dmxinput.c +++ b/xorg-server/hw/dmx/dmxinput.c @@ -88,7 +88,7 @@ void ProcessInputEvents(void) dmxInput->processInputEvents(dmxInput); } -/** This routine is called from #dmxwindow.c whenever the layout of +/** This routine is called from \a dmxwindow.c whenever the layout of * windows on the display might have changed. This information is used * by input drivers (currently only the console driver) that provide * information about window layout to the user. */ diff --git a/xorg-server/hw/dmx/dmxinput.h b/xorg-server/hw/dmx/dmxinput.h index c60ce958e..edfff9fa1 100644 --- a/xorg-server/hw/dmx/dmxinput.h +++ b/xorg-server/hw/dmx/dmxinput.h @@ -78,7 +78,7 @@ typedef enum { DMX_ACTIVESIGIO /**< Device is currently using SIGIO. */ } dmxSigioState; -/** DMXInputInfo is typedef'd in #dmx.h so that all routines can have +/** DMXInputInfo is typedef'd in \a dmx.h so that all routines can have * access to the global pointers. However, the elements are only * available to input-related routines. */ struct _DMXInputInfo { diff --git a/xorg-server/hw/dmx/dmxstat.c b/xorg-server/hw/dmx/dmxstat.c index e3c13a623..41b0eb27c 100644 --- a/xorg-server/hw/dmx/dmxstat.c +++ b/xorg-server/hw/dmx/dmxstat.c @@ -37,7 +37,7 @@ * might be necessary. However, since XSync() requires a two way * communication with the other X server, eliminating unnecessary * XSync() calls is a key performance optimization. Support for this - * optimization is provided in #dmxsync.c. This file provides routines + * optimization is provided in \a dmxsync.c. This file provides routines * that evaluate this optimization by counting the number of XSync() * calls and monitoring their latency. This functionality can be turned * on using the -stat command-line parameter. */ @@ -102,7 +102,7 @@ static unsigned long avg(DMXStatAvg *data, unsigned long *max) * interval is NULL, 1 will be used. If \a displays is NULL, 0 will be * used (meaning a line for every display will be printed). Note that * this function takes string arguments because it will usually be - * called from #ddxProcessArgument in #dmxinit.c. */ + * called from #ddxProcessArgument in \a dmxinit.c. */ void dmxStatActivate(const char *interval, const char *displays) { dmxStatInterval = (interval ? atoi(interval) : 1) * 1000; @@ -135,7 +135,7 @@ static void dmxStatValue(DMXStatAvg *data, unsigned long value) /** Note that a XSync() was just done on \a dmxScreen with the \a start * and \a stop times (from gettimeofday()) and the number of * pending-but-not-yet-processed XSync requests. This routine is called - * from #dmxDoSync in #dmxsync.c */ + * from #dmxDoSync in \a dmxsync.c */ void dmxStatSync(DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending) diff --git a/xorg-server/hw/dmx/dmxsync.c b/xorg-server/hw/dmx/dmxsync.c index c1aa43107..2cec1b97c 100644 --- a/xorg-server/hw/dmx/dmxsync.c +++ b/xorg-server/hw/dmx/dmxsync.c @@ -38,7 +38,7 @@ * communication with the other X server, eliminating unnecessary * XSync() calls is a key performance optimization. Support for this * optimization is provided here. Statistics about XSync() calls and - * latency are gathered in #dmxstat.c. + * latency are gathered in \a dmxstat.c. * * During the initial conversion from calling XSync() immediately to the * XSync() batching method implemented in this file, it was noted that, @@ -111,7 +111,7 @@ static void dmxSyncWakeupHandler(pointer blockData, int result, * turn off the default 100mS XSync() batching). * * Note that the parameter to this routine is a string, since it will - * usually be called from #ddxProcessArgument in #dmxinit.c */ + * usually be called from #ddxProcessArgument in \a dmxinit.c */ void dmxSyncActivate(const char *interval) { dmxSyncInterval = (interval ? atoi(interval) : 100); diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c index 24acc08e3..f9e46db1e 100644 --- a/xorg-server/hw/dmx/dmxwindow.c +++ b/xorg-server/hw/dmx/dmxwindow.c @@ -116,7 +116,7 @@ Window dmxCreateRootWindow(WindowPtr pWindow) } /** Change the location and size of the "screen" window. Called from - * #dmxReconfigureScreenWindow(). */ + * #dmxConfigureScreenWindow(). */ void dmxResizeScreenWindow(ScreenPtr pScreen, int x, int y, int w, int h) { @@ -139,7 +139,7 @@ void dmxResizeScreenWindow(ScreenPtr pScreen, } /** Change the location and size of the "root" window. Called from - * #dmxReconfigureRootWindow(). */ + * #dmxConfigureRootWindow. */ void dmxResizeRootWindow(WindowPtr pRoot, int x, int y, int w, int h) { @@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow) pWinPriv->windowDestroyed(pWindow); #endif -#if 0 if (pScreen->DestroyWindow) ret = pScreen->DestroyWindow(pWindow); -#endif + DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen); return ret; diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am index 08a60b811..0fb6e8949 100644 --- a/xorg-server/hw/dmx/doc/Makefile.am +++ b/xorg-server/hw/dmx/doc/Makefile.am @@ -51,6 +51,21 @@ noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) endif +if HAVE_DOXYGEN + +DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf + +all-local: html/annotated.html + +dist-local: html/annotated.html + +html/annotated.html: $(DOXYGEN_SRC) + $(DOXYGEN) $(srcdir)/doxygen.conf + +clean-local: + rm -rf html/ +endif + EXTRA_DIST = \ $(SGML_FILES) \ DMXSpec.txt \ @@ -64,123 +79,116 @@ EXTRA_DIST = \ html/annotated.html \ html/ChkNotMaskEv_8c.html \ html/ChkNotMaskEv_8h.html \ - html/ChkNotMaskEv_8h-source.html \ + html/ChkNotMaskEv_8h_source.html \ html/classes.html \ html/dmx_8h.html \ - html/dmx_8h-source.html \ + html/dmx_8h_source.html \ html/dmxarg_8c.html \ html/dmxarg_8h.html \ - html/dmxarg_8h-source.html \ + html/dmxarg_8h_source.html \ html/dmxbackend_8c.html \ html/dmxbackend_8h.html \ - html/dmxbackend_8h-source.html \ + html/dmxbackend_8h_source.html \ html/dmxcb_8c.html \ html/dmxcb_8h.html \ - html/dmxcb_8h-source.html \ + html/dmxcb_8h_source.html \ html/dmxclient_8h.html \ - html/dmxclient_8h-source.html \ + html/dmxclient_8h_source.html \ html/dmxcmap_8c.html \ html/dmxcmap_8h.html \ - html/dmxcmap_8h-source.html \ + html/dmxcmap_8h_source.html \ html/dmxcommon_8c.html \ html/dmxcommon_8h.html \ - html/dmxcommon_8h-source.html \ + html/dmxcommon_8h_source.html \ html/dmxcompat_8c.html \ html/dmxcompat_8h.html \ - html/dmxcompat_8h-source.html \ + html/dmxcompat_8h_source.html \ html/dmxconfig_8c.html \ html/dmxconfig_8h.html \ - html/dmxconfig_8h-source.html \ + html/dmxconfig_8h_source.html \ html/dmxconsole_8c.html \ html/dmxconsole_8h.html \ - html/dmxconsole_8h-source.html \ + html/dmxconsole_8h_source.html \ html/dmxcursor_8c.html \ html/dmxcursor_8h.html \ - html/dmxcursor_8h-source.html \ + html/dmxcursor_8h_source.html \ html/dmxdetach_8c.html \ html/dmxdpms_8c.html \ html/dmxdpms_8h.html \ - html/dmxdpms_8h-source.html \ + html/dmxdpms_8h_source.html \ html/dmxdummy_8c.html \ html/dmxdummy_8h.html \ - html/dmxdummy_8h-source.html \ - html/dmxeq_8c.html \ - html/dmxeq_8h.html \ - html/dmxeq_8h-source.html \ + html/dmxdummy_8h_source.html \ html/dmxevents_8c.html \ html/dmxevents_8h.html \ - html/dmxevents_8h-source.html \ - html/dmxext_8h.html \ - html/dmxext_8h-source.html \ + html/dmxevents_8h_source.html \ html/dmxextension_8c.html \ html/dmxextension_8h.html \ - html/dmxextension_8h-source.html \ + html/dmxextension_8h_source.html \ html/dmxfont_8c.html \ html/dmxfont_8h.html \ - html/dmxfont_8h-source.html \ + html/dmxfont_8h_source.html \ html/dmxgc_8c.html \ html/dmxgc_8h.html \ - html/dmxgc_8h-source.html \ + html/dmxgc_8h_source.html \ html/dmxgcops_8c.html \ html/dmxgcops_8h.html \ - html/dmxgcops_8h-source.html \ - html/dmx__glxvisuals_8h-source.html \ + html/dmxgcops_8h_source.html \ + html/dmx__glxvisuals_8h_source.html \ html/dmxinit_8c.html \ html/dmxinit_8h.html \ - html/dmxinit_8h-source.html \ + html/dmxinit_8h_source.html \ html/dmxinput_8c.html \ html/dmxinput_8h.html \ - html/dmxinput_8h-source.html \ + html/dmxinput_8h_source.html \ html/dmxinputinit_8c.html \ html/dmxinputinit_8h.html \ - html/dmxinputinit_8h-source.html \ + html/dmxinputinit_8h_source.html \ html/dmxlog_8c.html \ html/dmxlog_8h.html \ - html/dmxlog_8h-source.html \ + html/dmxlog_8h_source.html \ html/dmxmap_8c.html \ html/dmxmap_8h.html \ - html/dmxmap_8h-source.html \ + html/dmxmap_8h_source.html \ html/dmxmotion_8c.html \ html/dmxmotion_8h.html \ - html/dmxmotion_8h-source.html \ + html/dmxmotion_8h_source.html \ html/dmxparse_8c.html \ html/dmxparse_8h.html \ - html/dmxparse_8h-source.html \ + html/dmxparse_8h_source.html \ html/dmxpict_8c.html \ html/dmxpict_8h.html \ - html/dmxpict_8h-source.html \ + html/dmxpict_8h_source.html \ html/dmxpixmap_8c.html \ html/dmxpixmap_8h.html \ - html/dmxpixmap_8h-source.html \ + html/dmxpixmap_8h_source.html \ html/dmxprint_8c.html \ html/dmxprint_8h.html \ - html/dmxprint_8h-source.html \ + html/dmxprint_8h_source.html \ html/dmxprop_8c.html \ html/dmxprop_8h.html \ - html/dmxprop_8h-source.html \ - html/dmxproto_8h.html \ - html/dmxproto_8h-source.html \ + html/dmxprop_8h_source.html \ html/dmxscrinit_8c.html \ html/dmxscrinit_8h.html \ - html/dmxscrinit_8h-source.html \ + html/dmxscrinit_8h_source.html \ html/dmxshadow_8c.html \ html/dmxshadow_8h.html \ - html/dmxshadow_8h-source.html \ + html/dmxshadow_8h_source.html \ html/dmxsigio_8c.html \ html/dmxsigio_8h.html \ - html/dmxsigio_8h-source.html \ + html/dmxsigio_8h_source.html \ html/dmxstat_8c.html \ html/dmxstat_8h.html \ - html/dmxstat_8h-source.html \ + html/dmxstat_8h_source.html \ html/dmxsync_8c.html \ html/dmxsync_8h.html \ - html/dmxsync_8h-source.html \ + html/dmxsync_8h_source.html \ html/dmxvisual_8c.html \ html/dmxvisual_8h.html \ - html/dmxvisual_8h-source.html \ + html/dmxvisual_8h_source.html \ html/dmxwindow_8c.html \ html/dmxwindow_8h.html \ - html/dmxwindow_8h-source.html \ + html/dmxwindow_8h_source.html \ html/dmxxinput_8c.html \ html/doxygen.css \ html/doxygen.png \ @@ -207,18 +215,16 @@ EXTRA_DIST = \ html/globals_type.html \ html/globals_vars.html \ html/index.html \ - html/lib_2dmx_2dmx_8c.html \ html/lnx-keyboard_8c.html \ html/lnx-keyboard_8h.html \ - html/lnx-keyboard_8h-source.html \ + html/lnx-keyboard_8h_source.html \ html/lnx-ms_8c.html \ html/lnx-ms_8h.html \ - html/lnx-ms_8h-source.html \ + html/lnx-ms_8h_source.html \ html/lnx-ps2_8c.html \ html/lnx-ps2_8h.html \ - html/lnx-ps2_8h-source.html \ + html/lnx-ps2_8h_source.html \ html/main.html \ - html/programs_2Xserver_2Xext_2dmx_8c.html \ html/struct__dmxArg.html \ html/struct__dmxColormapPriv.html \ html/structDMXConfigCmdStruct.html \ @@ -238,73 +244,47 @@ EXTRA_DIST = \ html/struct__DMXConfigVirtual.html \ html/struct__DMXConfigWall.html \ html/struct__dmxCursorPriv.html \ - html/structDMXDesktopAttributes.html \ html/structDMXDesktopAttributesRec.html \ html/struct__DMXEventMap.html \ html/struct__dmxFontPriv.html \ html/struct__dmxGCPriv.html \ html/structdmxGlxVisualPrivate.html \ html/struct__dmxGlyphPriv.html \ - html/structDMXInputAttributes.html \ html/structDMXInputAttributesRec.html \ html/struct__DMXInputInfo.html \ html/struct__DMXLocalInitInfo.html \ html/struct__DMXLocalInputInfo.html \ html/struct__dmxPictPriv.html \ html/struct__dmxPixPriv.html \ - html/structDMXScreenAttributes.html \ html/structDMXScreenAttributesRec.html \ html/struct__DMXScreenInfo.html \ html/struct__DMXStatAvg.html \ html/struct__DMXStatInfo.html \ - html/structDMXWindowAttributes.html \ html/structDMXWindowAttributesRec.html \ html/struct__dmxWinPriv.html \ - html/struct__Event.html \ - html/struct__EventQueue.html \ html/struct__myPrivate.html \ - html/structxDMXAddInputReply.html \ - html/structxDMXAddInputReq.html \ - html/structxDMXAddScreenReply.html \ - html/structxDMXAddScreenReq.html \ - html/structxDMXChangeDesktopAttributesReply.html \ - html/structxDMXChangeDesktopAttributesReq.html \ - html/structxDMXChangeScreensAttributesReply.html \ - html/structxDMXChangeScreensAttributesReq.html \ - html/structxDMXForceWindowCreationReply.html \ - html/structxDMXForceWindowCreationReq.html \ - html/structxDMXGetDesktopAttributesReply.html \ - html/structxDMXGetDesktopAttributesReq.html \ - html/structxDMXGetInputAttributesReply.html \ - html/structxDMXGetInputAttributesReq.html \ - html/structxDMXGetInputCountReply.html \ - html/structxDMXGetInputCountReq.html \ - html/structxDMXGetScreenAttributesReply.html \ - html/structxDMXGetScreenAttributesReq.html \ - html/structxDMXGetScreenCountReply.html \ - html/structxDMXGetScreenCountReq.html \ - html/structxDMXGetWindowAttributesReply.html \ - html/structxDMXGetWindowAttributesReq.html \ - html/structxDMXQueryVersionReply.html \ - html/structxDMXQueryVersionReq.html \ - html/structxDMXRemoveInputReply.html \ - html/structxDMXRemoveInputReq.html \ - html/structxDMXRemoveScreenReply.html \ - html/structxDMXRemoveScreenReq.html \ - html/structxDMXSyncReply.html \ - html/structxDMXSyncReq.html \ html/tree.html \ html/usb-common_8c.html \ html/usb-common_8h.html \ - html/usb-common_8h-source.html \ + html/usb-common_8h_source.html \ html/usb-keyboard_8c.html \ html/usb-keyboard_8h.html \ - html/usb-keyboard_8h-source.html \ + html/usb-keyboard_8h_source.html \ html/usb-mouse_8c.html \ html/usb-mouse_8h.html \ - html/usb-mouse_8h-source.html \ + html/usb-mouse_8h_source.html \ html/usb-other_8c.html \ html/usb-other_8h.html \ - html/usb-other_8h-source.html \ + html/usb-other_8h_source.html \ html/usb-private_8h.html \ - html/usb-private_8h-source.html + html/usb-private_8h_source.html + +$(builddir)/doxygen.head: + $(LN_S) $(srcdir)/doxygen.head $@ + +$(builddir)/doxygen.foot: + $(LN_S) $(srcdir)/doxygen.foot $@ + +$(builddir)doxygen.css: + $(LN_S) $(srcdir)/doxygen.css $@ + diff --git a/xorg-server/hw/dmx/doc/Makefile.in b/xorg-server/hw/dmx/doc/Makefile.in index 0fcef8ffa..95f7febd0 100644 --- a/xorg-server/hw/dmx/doc/Makefile.in +++ b/xorg-server/hw/dmx/doc/Makefile.in @@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -92,7 +92,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -117,7 +116,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -141,6 +139,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -158,8 +157,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -205,7 +202,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -231,6 +227,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -240,7 +237,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -254,7 +250,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -296,8 +291,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -340,6 +333,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -371,7 +365,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -387,6 +380,7 @@ SGML_FILES = dmx.sgml scaled.sgml @BUILD_LINUXDOC_TRUE@SUFFIXES = .sgml .txt .html .ps .pdf @BUILD_LINUXDOC_TRUE@noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) @BUILD_LINUXDOC_TRUE@CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) +@HAVE_DOXYGEN_TRUE@DOXYGEN_SRC = doxygen.head doxygen.foot doxygen.css doxygen.conf EXTRA_DIST = \ $(SGML_FILES) \ DMXSpec.txt \ @@ -400,123 +394,116 @@ EXTRA_DIST = \ html/annotated.html \ html/ChkNotMaskEv_8c.html \ html/ChkNotMaskEv_8h.html \ - html/ChkNotMaskEv_8h-source.html \ + html/ChkNotMaskEv_8h_source.html \ html/classes.html \ html/dmx_8h.html \ - html/dmx_8h-source.html \ + html/dmx_8h_source.html \ html/dmxarg_8c.html \ html/dmxarg_8h.html \ - html/dmxarg_8h-source.html \ + html/dmxarg_8h_source.html \ html/dmxbackend_8c.html \ html/dmxbackend_8h.html \ - html/dmxbackend_8h-source.html \ + html/dmxbackend_8h_source.html \ html/dmxcb_8c.html \ html/dmxcb_8h.html \ - html/dmxcb_8h-source.html \ + html/dmxcb_8h_source.html \ html/dmxclient_8h.html \ - html/dmxclient_8h-source.html \ + html/dmxclient_8h_source.html \ html/dmxcmap_8c.html \ html/dmxcmap_8h.html \ - html/dmxcmap_8h-source.html \ + html/dmxcmap_8h_source.html \ html/dmxcommon_8c.html \ html/dmxcommon_8h.html \ - html/dmxcommon_8h-source.html \ + html/dmxcommon_8h_source.html \ html/dmxcompat_8c.html \ html/dmxcompat_8h.html \ - html/dmxcompat_8h-source.html \ + html/dmxcompat_8h_source.html \ html/dmxconfig_8c.html \ html/dmxconfig_8h.html \ - html/dmxconfig_8h-source.html \ + html/dmxconfig_8h_source.html \ html/dmxconsole_8c.html \ html/dmxconsole_8h.html \ - html/dmxconsole_8h-source.html \ + html/dmxconsole_8h_source.html \ html/dmxcursor_8c.html \ html/dmxcursor_8h.html \ - html/dmxcursor_8h-source.html \ + html/dmxcursor_8h_source.html \ html/dmxdetach_8c.html \ html/dmxdpms_8c.html \ html/dmxdpms_8h.html \ - html/dmxdpms_8h-source.html \ + html/dmxdpms_8h_source.html \ html/dmxdummy_8c.html \ html/dmxdummy_8h.html \ - html/dmxdummy_8h-source.html \ - html/dmxeq_8c.html \ - html/dmxeq_8h.html \ - html/dmxeq_8h-source.html \ + html/dmxdummy_8h_source.html \ html/dmxevents_8c.html \ html/dmxevents_8h.html \ - html/dmxevents_8h-source.html \ - html/dmxext_8h.html \ - html/dmxext_8h-source.html \ + html/dmxevents_8h_source.html \ html/dmxextension_8c.html \ html/dmxextension_8h.html \ - html/dmxextension_8h-source.html \ + html/dmxextension_8h_source.html \ html/dmxfont_8c.html \ html/dmxfont_8h.html \ - html/dmxfont_8h-source.html \ + html/dmxfont_8h_source.html \ html/dmxgc_8c.html \ html/dmxgc_8h.html \ - html/dmxgc_8h-source.html \ + html/dmxgc_8h_source.html \ html/dmxgcops_8c.html \ html/dmxgcops_8h.html \ - html/dmxgcops_8h-source.html \ - html/dmx__glxvisuals_8h-source.html \ + html/dmxgcops_8h_source.html \ + html/dmx__glxvisuals_8h_source.html \ html/dmxinit_8c.html \ html/dmxinit_8h.html \ - html/dmxinit_8h-source.html \ + html/dmxinit_8h_source.html \ html/dmxinput_8c.html \ html/dmxinput_8h.html \ - html/dmxinput_8h-source.html \ + html/dmxinput_8h_source.html \ html/dmxinputinit_8c.html \ html/dmxinputinit_8h.html \ - html/dmxinputinit_8h-source.html \ + html/dmxinputinit_8h_source.html \ html/dmxlog_8c.html \ html/dmxlog_8h.html \ - html/dmxlog_8h-source.html \ + html/dmxlog_8h_source.html \ html/dmxmap_8c.html \ html/dmxmap_8h.html \ - html/dmxmap_8h-source.html \ + html/dmxmap_8h_source.html \ html/dmxmotion_8c.html \ html/dmxmotion_8h.html \ - html/dmxmotion_8h-source.html \ + html/dmxmotion_8h_source.html \ html/dmxparse_8c.html \ html/dmxparse_8h.html \ - html/dmxparse_8h-source.html \ + html/dmxparse_8h_source.html \ html/dmxpict_8c.html \ html/dmxpict_8h.html \ - html/dmxpict_8h-source.html \ + html/dmxpict_8h_source.html \ html/dmxpixmap_8c.html \ html/dmxpixmap_8h.html \ - html/dmxpixmap_8h-source.html \ + html/dmxpixmap_8h_source.html \ html/dmxprint_8c.html \ html/dmxprint_8h.html \ - html/dmxprint_8h-source.html \ + html/dmxprint_8h_source.html \ html/dmxprop_8c.html \ html/dmxprop_8h.html \ - html/dmxprop_8h-source.html \ - html/dmxproto_8h.html \ - html/dmxproto_8h-source.html \ + html/dmxprop_8h_source.html \ html/dmxscrinit_8c.html \ html/dmxscrinit_8h.html \ - html/dmxscrinit_8h-source.html \ + html/dmxscrinit_8h_source.html \ html/dmxshadow_8c.html \ html/dmxshadow_8h.html \ - html/dmxshadow_8h-source.html \ + html/dmxshadow_8h_source.html \ html/dmxsigio_8c.html \ html/dmxsigio_8h.html \ - html/dmxsigio_8h-source.html \ + html/dmxsigio_8h_source.html \ html/dmxstat_8c.html \ html/dmxstat_8h.html \ - html/dmxstat_8h-source.html \ + html/dmxstat_8h_source.html \ html/dmxsync_8c.html \ html/dmxsync_8h.html \ - html/dmxsync_8h-source.html \ + html/dmxsync_8h_source.html \ html/dmxvisual_8c.html \ html/dmxvisual_8h.html \ - html/dmxvisual_8h-source.html \ + html/dmxvisual_8h_source.html \ html/dmxwindow_8c.html \ html/dmxwindow_8h.html \ - html/dmxwindow_8h-source.html \ + html/dmxwindow_8h_source.html \ html/dmxxinput_8c.html \ html/doxygen.css \ html/doxygen.png \ @@ -543,18 +530,16 @@ EXTRA_DIST = \ html/globals_type.html \ html/globals_vars.html \ html/index.html \ - html/lib_2dmx_2dmx_8c.html \ html/lnx-keyboard_8c.html \ html/lnx-keyboard_8h.html \ - html/lnx-keyboard_8h-source.html \ + html/lnx-keyboard_8h_source.html \ html/lnx-ms_8c.html \ html/lnx-ms_8h.html \ - html/lnx-ms_8h-source.html \ + html/lnx-ms_8h_source.html \ html/lnx-ps2_8c.html \ html/lnx-ps2_8h.html \ - html/lnx-ps2_8h-source.html \ + html/lnx-ps2_8h_source.html \ html/main.html \ - html/programs_2Xserver_2Xext_2dmx_8c.html \ html/struct__dmxArg.html \ html/struct__dmxColormapPriv.html \ html/structDMXConfigCmdStruct.html \ @@ -574,76 +559,40 @@ EXTRA_DIST = \ html/struct__DMXConfigVirtual.html \ html/struct__DMXConfigWall.html \ html/struct__dmxCursorPriv.html \ - html/structDMXDesktopAttributes.html \ html/structDMXDesktopAttributesRec.html \ html/struct__DMXEventMap.html \ html/struct__dmxFontPriv.html \ html/struct__dmxGCPriv.html \ html/structdmxGlxVisualPrivate.html \ html/struct__dmxGlyphPriv.html \ - html/structDMXInputAttributes.html \ html/structDMXInputAttributesRec.html \ html/struct__DMXInputInfo.html \ html/struct__DMXLocalInitInfo.html \ html/struct__DMXLocalInputInfo.html \ html/struct__dmxPictPriv.html \ html/struct__dmxPixPriv.html \ - html/structDMXScreenAttributes.html \ html/structDMXScreenAttributesRec.html \ html/struct__DMXScreenInfo.html \ html/struct__DMXStatAvg.html \ html/struct__DMXStatInfo.html \ - html/structDMXWindowAttributes.html \ html/structDMXWindowAttributesRec.html \ html/struct__dmxWinPriv.html \ - html/struct__Event.html \ - html/struct__EventQueue.html \ html/struct__myPrivate.html \ - html/structxDMXAddInputReply.html \ - html/structxDMXAddInputReq.html \ - html/structxDMXAddScreenReply.html \ - html/structxDMXAddScreenReq.html \ - html/structxDMXChangeDesktopAttributesReply.html \ - html/structxDMXChangeDesktopAttributesReq.html \ - html/structxDMXChangeScreensAttributesReply.html \ - html/structxDMXChangeScreensAttributesReq.html \ - html/structxDMXForceWindowCreationReply.html \ - html/structxDMXForceWindowCreationReq.html \ - html/structxDMXGetDesktopAttributesReply.html \ - html/structxDMXGetDesktopAttributesReq.html \ - html/structxDMXGetInputAttributesReply.html \ - html/structxDMXGetInputAttributesReq.html \ - html/structxDMXGetInputCountReply.html \ - html/structxDMXGetInputCountReq.html \ - html/structxDMXGetScreenAttributesReply.html \ - html/structxDMXGetScreenAttributesReq.html \ - html/structxDMXGetScreenCountReply.html \ - html/structxDMXGetScreenCountReq.html \ - html/structxDMXGetWindowAttributesReply.html \ - html/structxDMXGetWindowAttributesReq.html \ - html/structxDMXQueryVersionReply.html \ - html/structxDMXQueryVersionReq.html \ - html/structxDMXRemoveInputReply.html \ - html/structxDMXRemoveInputReq.html \ - html/structxDMXRemoveScreenReply.html \ - html/structxDMXRemoveScreenReq.html \ - html/structxDMXSyncReply.html \ - html/structxDMXSyncReq.html \ html/tree.html \ html/usb-common_8c.html \ html/usb-common_8h.html \ - html/usb-common_8h-source.html \ + html/usb-common_8h_source.html \ html/usb-keyboard_8c.html \ html/usb-keyboard_8h.html \ - html/usb-keyboard_8h-source.html \ + html/usb-keyboard_8h_source.html \ html/usb-mouse_8c.html \ html/usb-mouse_8h.html \ - html/usb-mouse_8h-source.html \ + html/usb-mouse_8h_source.html \ html/usb-other_8c.html \ html/usb-other_8h.html \ - html/usb-other_8h-source.html \ + html/usb-other_8h_source.html \ html/usb-private_8h.html \ - html/usb-private_8h-source.html + html/usb-private_8h_source.html all: all-am @@ -724,7 +673,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(DATA) +@HAVE_DOXYGEN_FALSE@all-local: +all-am: Makefile $(DATA) all-local installdirs: install: install-am install-exec: install-exec-am @@ -752,9 +702,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@HAVE_DOXYGEN_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -820,16 +771,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - 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 \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-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 installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am @BUILD_LINUXDOC_TRUE@.sgml.txt: @@ -848,6 +800,25 @@ uninstall-am: @BUILD_LINUXDOC_TRUE@ @rm -f $@ @BUILD_LINUXDOC_TRUE@ $(MAKE_HTML) $< +@HAVE_DOXYGEN_TRUE@all-local: html/annotated.html + +@HAVE_DOXYGEN_TRUE@dist-local: html/annotated.html + +@HAVE_DOXYGEN_TRUE@html/annotated.html: $(DOXYGEN_SRC) +@HAVE_DOXYGEN_TRUE@ $(DOXYGEN) $(srcdir)/doxygen.conf + +@HAVE_DOXYGEN_TRUE@clean-local: +@HAVE_DOXYGEN_TRUE@ rm -rf html/ + +$(builddir)/doxygen.head: + $(LN_S) $(srcdir)/doxygen.head $@ + +$(builddir)/doxygen.foot: + $(LN_S) $(srcdir)/doxygen.foot $@ + +$(builddir)doxygen.css: + $(LN_S) $(srcdir)/doxygen.css $@ + # 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: diff --git a/xorg-server/hw/dmx/doc/doxygen.conf b/xorg-server/hw/dmx/doc/doxygen.conf index 5b706b6d6..f7a541f90 100644 --- a/xorg-server/hw/dmx/doc/doxygen.conf +++ b/xorg-server/hw/dmx/doc/doxygen.conf @@ -43,16 +43,6 @@ OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -115,13 +105,6 @@ JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented # member inherits the documentation from any documented member that it # reimplements. @@ -180,7 +163,7 @@ SUBGROUPING = YES # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL = NO +EXTRACT_ALL = YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. @@ -190,7 +173,7 @@ EXTRACT_PRIVATE = NO # If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. -EXTRACT_STATIC = NO +EXTRACT_STATIC = YES # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) # defined locally in source files will be included in the documentation. @@ -363,11 +346,7 @@ WARN_LOGFILE = INPUT = .. \ ../input \ - ../config \ - ../../../Xext/dmx.c \ - ../../../../../include/extensions/dmxproto.h \ - ../../../../../include/extensions/dmxext.h \ - ../../../../../lib/dmx + ../config # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -1041,22 +1020,6 @@ DOT_PATH = DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable # from the root by following a path via at most 3 edges will be shown. Nodes that diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html index 29fc27d63..fffd19f23 100644 --- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html +++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html @@ -6,62 +6,89 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

ChkNotMaskEv.c File Reference

#include "dmx.h"
-#include "ChkNotMaskEv.h"
- - - - - + + +
+

ChkNotMaskEv.c File Reference

#include "dmx.h"
+#include "ChkNotMaskEv.h"
+

Functions

Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event)
+ + + +

Functions

Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event)

Variables

long const _Xevent_to_mask []
-

Detailed Description

-This file provides a XCheckNotMaskEvent function that is derived from the standard Xlib XCheckMaskEvent function.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides a XCheckNotMaskEvent function that is derived from the standard Xlib XCheckMaskEvent function.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + +
Bool XCheckNotMaskEvent ( Display *  dpy, Bool XCheckNotMaskEvent (Display *  dpy,
long  mask, long  mask,
XEvent *  eventXEvent *  event 
) )
+ +
+

Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.

+ +

References _Xevent_to_mask.

+ +

Referenced by dmxBackendTestEvents().

+
+ +

Variable Documentation

+ +
+
+ + + +
long const _Xevent_to_mask[]
-
- - - - - -
-   - + +
-

-Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.

+

Referenced by XCheckNotMaskEvent().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html deleted file mode 100644 index 4a4fc4c52..000000000 --- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

ChkNotMaskEv.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _CHKNOTMASKEV_H_
-00039 #define _CHKNOTMASKEV_H_
-00040 extern Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event);
-00041 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html index 658c94d9f..c06558216 100644 --- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html +++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html @@ -6,63 +6,72 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

ChkNotMaskEv.h File Reference

-

-Go to the source code of this file. - - - - +

Go to the source code of this file.

+

Functions

Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event)
+ +

Functions

Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event)
-

Detailed Description

-Interface for XCheckNotMaskEvent function.
See also:
ChkNotMaskEv.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for XCheckNotMaskEvent function.

+
See also:
ChkNotMaskEv.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
Bool XCheckNotMaskEvent ( Display *  dpy, Bool XCheckNotMaskEvent (Display *  dpy,
long  mask, long  mask,
XEvent *  eventXEvent *  event 
) )
-
- - - - - -
-   - + +
+

Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.

-

-Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.

+

References _Xevent_to_mask.

+ +

Referenced by dmxBackendTestEvents().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html new file mode 100644 index 000000000..d48888718 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html @@ -0,0 +1,73 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/annotated.html b/xorg-server/hw/dmx/doc/html/annotated.html index 0bd5e9c98..88ce7d6df 100644 --- a/xorg-server/hw/dmx/doc/html/annotated.html +++ b/xorg-server/hw/dmx/doc/html/annotated.html @@ -6,9 +6,25 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

Distributed Multihead X Data Structures

Here are the data structures with brief descriptions: + + +
+

Data Structures

Here are the data structures with brief descriptions:
@@ -39,51 +55,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
_dmxArg
_dmxColormapPriv
_DMXConfigComment
_DMXStatAvg
_DMXStatInfo
_dmxWinPriv
_Event
_EventQueue
_myPrivate
DMXConfigCmdStruct
DMXConfigListStruct
DMXDesktopAttributes
DMXDesktopAttributesRec
dmxGlxVisualPrivate
DMXInputAttributes
DMXInputAttributesRec
DMXScreenAttributes
DMXScreenAttributesRec
DMXWindowAttributes
DMXWindowAttributesRec
xDMXAddInputReply
xDMXAddInputReq
xDMXAddScreenReply
xDMXAddScreenReq
xDMXChangeDesktopAttributesReply
xDMXChangeDesktopAttributesReq
xDMXChangeScreensAttributesReply
xDMXChangeScreensAttributesReq
xDMXForceWindowCreationReply
xDMXForceWindowCreationReq
xDMXGetDesktopAttributesReply
xDMXGetDesktopAttributesReq
xDMXGetInputAttributesReply
xDMXGetInputAttributesReq
xDMXGetInputCountReply
xDMXGetInputCountReq
xDMXGetScreenAttributesReply
xDMXGetScreenAttributesReq
xDMXGetScreenCountReply
xDMXGetScreenCountReq
xDMXGetWindowAttributesReply
xDMXGetWindowAttributesReq
xDMXQueryVersionReply
xDMXQueryVersionReq
xDMXRemoveInputReply
xDMXRemoveInputReq
xDMXRemoveScreenReply
xDMXRemoveScreenReq
xDMXSyncReply
xDMXSyncReq
stack
+
diff --git a/xorg-server/hw/dmx/doc/html/classes.html b/xorg-server/hw/dmx/doc/html/classes.html index d6632fb09..b7b6b8d3b 100644 --- a/xorg-server/hw/dmx/doc/html/classes.html +++ b/xorg-server/hw/dmx/doc/html/classes.html @@ -6,13 +6,32 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

Distributed Multihead X Data Structure Index

-
  _  
-		_DMXConfigWall   _EventQueue   xDMXAddInputReply   xDMXGetInputCountReq   
_dmxArg   _dmxCursorPriv   _myPrivate   xDMXAddInputReq   xDMXGetScreenAttributesReply   
_dmxColormapPriv   _DMXEventMap   
  D  
-		xDMXAddScreenReply   xDMXGetScreenAttributesReq   
_DMXConfigComment   _dmxFontPriv   DMXConfigCmdStruct   xDMXAddScreenReq   xDMXGetScreenCountReply   
_DMXConfigDisplay   _dmxGCPriv   DMXConfigListStruct   xDMXChangeDesktopAttributesReply   xDMXGetScreenCountReq   
_DMXConfigEntry   _dmxGlyphPriv   DMXDesktopAttributes   xDMXChangeDesktopAttributesReq   xDMXGetWindowAttributesReply   
_DMXConfigFullDim   _DMXInputInfo   DMXDesktopAttributesRec   xDMXChangeScreensAttributesReply   xDMXGetWindowAttributesReq   
_DMXConfigNumber   _DMXLocalInitInfo   dmxGlxVisualPrivate   xDMXChangeScreensAttributesReq   xDMXQueryVersionReply   
_DMXConfigOption   _DMXLocalInputInfo   DMXInputAttributes   xDMXForceWindowCreationReply   xDMXQueryVersionReq   
_DMXConfigPair   _dmxPictPriv   DMXInputAttributesRec   xDMXForceWindowCreationReq   xDMXRemoveInputReply   
_DMXConfigParam   _dmxPixPriv   DMXScreenAttributes   xDMXGetDesktopAttributesReply   xDMXRemoveInputReq   
_DMXConfigPartDim   _DMXScreenInfo   DMXScreenAttributesRec   xDMXGetDesktopAttributesReq   xDMXRemoveScreenReply   
_DMXConfigString   _DMXStatAvg   DMXWindowAttributes   xDMXGetInputAttributesReply   xDMXRemoveScreenReq   
_DMXConfigSub   _DMXStatInfo   DMXWindowAttributesRec   xDMXGetInputAttributesReq   xDMXSyncReply   
_DMXConfigToken   _dmxWinPriv   
  X  
-		xDMXGetInputCountReply   xDMXSyncReq   
_DMXConfigVirtual   _Event   
+ + +
+

Data Structure Index

D | S | _
+ +
  D  
+		stack   _DMXConfigOption   _DMXConfigWall   _DMXLocalInputInfo   
DMXConfigCmdStruct   
  _  
+		_DMXConfigPair   _dmxCursorPriv   _dmxPictPriv   
DMXConfigListStruct   _dmxArg   _DMXConfigParam   _DMXEventMap   _dmxPixPriv   
DMXDesktopAttributesRec   _dmxColormapPriv   _DMXConfigPartDim   _dmxFontPriv   _DMXScreenInfo   
dmxGlxVisualPrivate   _DMXConfigComment   _DMXConfigString   _dmxGCPriv   _DMXStatAvg   
DMXInputAttributesRec   _DMXConfigDisplay   _DMXConfigSub   _dmxGlyphPriv   _DMXStatInfo   
DMXScreenAttributesRec   _DMXConfigEntry   _DMXConfigToken   _DMXInputInfo   _dmxWinPriv   
DMXWindowAttributesRec   _DMXConfigFullDim   _DMXConfigVirtual   _DMXLocalInitInfo   _myPrivate   
  S  
+		_DMXConfigNumber   
D | S | _
+
+
Generated June 29, 2004 for - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmx.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *   David H. Dawes <dawes@xfree86.org>
-00033  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00034  *
-00035  */
-00036 
-00051 #ifndef DMX_H
-00052 #define DMX_H
-00053 
-00054 #include "gcstruct.h"
-00055 
-00056 /* Handle client-side include files in one place. */
-00057 #include "dmxclient.h"
-00058 
-00059 #include "globals.h"
-00060 #include "scrnintstr.h"
-00061 
-00062 #ifdef RENDER
-00063 #include "picturestr.h"
-00064 #endif
-00065 
-00066 #ifdef GLXEXT
-00067 #include <GL/glx.h>
-00068 #include <GL/glxint.h>
-00069 #endif
-00070 
-00071 typedef enum {
-00072     PosNone = -1,
-00073     PosAbsolute = 0,
-00074     PosRightOf,
-00075     PosLeftOf,
-00076     PosAbove,
-00077     PosBelow,
-00078     PosRelative
-00079 } PositionType;
-00080 
-00083 typedef struct _DMXInputInfo DMXInputInfo;
-00084 
-00087 typedef struct _DMXStatInfo DMXStatInfo;
-00088 
-00090 typedef struct _DMXScreenInfo {
-00091     const char   *name;           
-00092     int           index;          
-00094     /*---------- Back-end X server information ----------*/
-00095 
-00096     Display      *beDisplay;      
-00097     int           beWidth;        
-00098     int           beHeight;       
-00099     int           beDepth;        
-00100     int           beBPP;          
-00101     int           beXDPI;         
-00102     int           beYDPI;         
-00104     int           beNumDepths;    
-00105     int          *beDepths;       
-00107     int           beNumPixmapFormats; 
-00108     XPixmapFormatValues *bePixmapFormats; 
-00110     int           beNumVisuals;   
-00111     XVisualInfo  *beVisuals;      
-00112     int           beDefVisualIndex; 
-00114     int           beNumDefColormaps; 
-00115     Colormap     *beDefColormaps; 
-00117     Pixel         beBlackPixel;   
-00118     Pixel         beWhitePixel;   
-00120     /*---------- Screen window information ----------*/
-00121 
-00122     Window        scrnWin;        
-00123     int           scrnX;          
-00124     int           scrnY;          
-00125     int           scrnWidth;      
-00126     int           scrnHeight;     
-00127     int           scrnXSign;      
-00128     int           scrnYSign;      
-00131     Drawable      scrnDefDrawables[MAXFORMATS];
-00132 
-00133     struct _DMXScreenInfo *next;  
-00134     struct _DMXScreenInfo *over;  
-00136     /*---------- Root window information ----------*/
-00137 
-00138     Window        rootWin;        
-00139     int           rootX;          
-00140     int           rootY;          
-00141     int           rootWidth;      
-00142     int           rootHeight;     
-00144     int           rootXOrigin;    
-00145     int           rootYOrigin;    
-00147     /*---------- Shadow framebuffer information ----------*/
-00148 
-00149     void         *shadow;         
-00150     XlibGC        shadowGC;       
-00151     XImage       *shadowFBImage;  
-00153     /*---------- Other related information ----------*/
-00154 
-00155     int           shared;         
-00157     Bool          WMRunningOnBE;
-00158 
-00159     Cursor        noCursor;
-00160     Cursor        curCursor;
-00161                                 /* Support for cursors on overlapped
-00162                                  * backend displays. */
-00163     CursorPtr     cursor;
-00164     int           cursorVisible;
-00165     int           cursorNotShared; /* for overlapping screens on a backend */
-00166 
-00167     PositionType  where;            
-00168     int           whereX;           
-00169     int           whereY;           
-00170     int           whereRefScreen;   
-00172     int           savedTimeout;     
-00173     int           dpmsCapable;      
-00174     int           dpmsEnabled;      
-00175     int           dpmsStandby;      
-00176     int           dpmsSuspend;      
-00177     int           dpmsOff;          
-00179     DMXStatInfo  *stat;             
-00180     Bool          needsSync;        
-00182 #ifdef GLXEXT
-00183 
-00184     int           numGlxVisuals;
-00185     __GLXvisualConfig *glxVisuals;
-00186     int           glxMajorOpcode;
-00187     int           glxErrorBase;
-00188 
-00190     __GLXFBConfig *fbconfigs;
-00191     int           numFBConfigs;
-00192 #endif
-00193 
-00196     CloseScreenProcPtr             CloseScreen;
-00197     SaveScreenProcPtr              SaveScreen;
-00198 
-00199     CreateGCProcPtr                CreateGC;
-00200 
-00201     CreateWindowProcPtr            CreateWindow;
-00202     DestroyWindowProcPtr           DestroyWindow;
-00203     PositionWindowProcPtr          PositionWindow;
-00204     ChangeWindowAttributesProcPtr  ChangeWindowAttributes;
-00205     RealizeWindowProcPtr           RealizeWindow;
-00206     UnrealizeWindowProcPtr         UnrealizeWindow;
-00207     RestackWindowProcPtr           RestackWindow;
-00208     WindowExposuresProcPtr         WindowExposures;
-00209     PaintWindowBackgroundProcPtr   PaintWindowBackground;
-00210     PaintWindowBorderProcPtr       PaintWindowBorder;
-00211     CopyWindowProcPtr              CopyWindow;
-00212 
-00213     ResizeWindowProcPtr            ResizeWindow;
-00214     ReparentWindowProcPtr          ReparentWindow;
-00215 
-00216     ChangeBorderWidthProcPtr       ChangeBorderWidth;
-00217 
-00218     GetImageProcPtr                GetImage;
-00219     GetSpansProcPtr                GetSpans;
-00220 
-00221     CreatePixmapProcPtr            CreatePixmap;
-00222     DestroyPixmapProcPtr           DestroyPixmap;
-00223     BitmapToRegionProcPtr          BitmapToRegion;
-00224 
-00225     RealizeFontProcPtr             RealizeFont;
-00226     UnrealizeFontProcPtr           UnrealizeFont;
-00227 
-00228     CreateColormapProcPtr          CreateColormap;
-00229     DestroyColormapProcPtr         DestroyColormap;
-00230     InstallColormapProcPtr         InstallColormap;
-00231     StoreColorsProcPtr             StoreColors;
-00232 
-00233 #ifdef SHAPE
-00234     SetShapeProcPtr                SetShape;
-00235 #endif
-00236 
-00237 #ifdef RENDER
-00238     CreatePictureProcPtr           CreatePicture;
-00239     DestroyPictureProcPtr          DestroyPicture;
-00240     ChangePictureClipProcPtr       ChangePictureClip;
-00241     DestroyPictureClipProcPtr      DestroyPictureClip;
-00242     
-00243     ChangePictureProcPtr           ChangePicture;
-00244     ValidatePictureProcPtr         ValidatePicture;
-00245 
-00246     CompositeProcPtr               Composite;
-00247     GlyphsProcPtr                  Glyphs;
-00248     CompositeRectsProcPtr          CompositeRects;
-00249 
-00250     InitIndexedProcPtr             InitIndexed;
-00251     CloseIndexedProcPtr            CloseIndexed;
-00252     UpdateIndexedProcPtr           UpdateIndexed;
-00253 
-00254     TrapezoidsProcPtr              Trapezoids;
-00255     TrianglesProcPtr               Triangles;
-00256     TriStripProcPtr                TriStrip;
-00257     TriFanProcPtr                  TriFan;
-00258 #endif
-00259 } DMXScreenInfo;
-00260 
-00261 /* Global variables available to all Xserver/hw/dmx routines. */
-00262 extern int              dmxNumScreens;          
-00263 extern DMXScreenInfo   *dmxScreens;             
-00264 extern int              dmxShadowFB;            
-00267 extern XErrorEvent      dmxLastErrorEvent;      
-00269 extern Bool             dmxErrorOccurred;       
-00271 extern Bool             dmxOffScreenOpt;        
-00274 extern Bool             dmxSubdividePrimitives; 
-00277 extern Bool             dmxLazyWindowCreation;  
-00280 extern Bool             dmxUseXKB;              
-00284 extern int              dmxDepth;               
-00286 extern Bool             dmxNoRender;            
-00289 #ifdef GLXEXT
-00290 extern Bool             dmxGLXProxy;            
-00292 extern Bool             dmxGLXSwapGroupSupport; 
-00296 extern Bool             dmxGLXSyncSwap;         
-00300 extern Bool             dmxGLXFinishSwap;       
-00305 #endif
-00306 extern char            *dmxFontPath;            
-00315 extern Bool             dmxIgnoreBadFontPaths;  
-00319 extern Bool             dmxAddRemoveScreens;    
-00324 #define DMX_WRAP(_entry, _newfunc, _saved, _actual)                     \
-00325 do {                                                                    \
-00326     (_saved)->_entry  = (_actual)->_entry;                              \
-00327     (_actual)->_entry = (_newfunc);                                     \
-00328 } while (0)
-00329 
-00331 #define DMX_UNWRAP(_entry, _saved, _actual)                             \
-00332 do {                                                                    \
-00333     (_actual)->_entry = (_saved)->_entry;                               \
-00334 } while (0)
-00335 
-00336 #endif /* DMX_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmx_8h.html b/xorg-server/hw/dmx/doc/html/dmx_8h.html index ecdde319d..1cb2f06ea 100644 --- a/xorg-server/hw/dmx/doc/html/dmx_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmx_8h.html @@ -6,518 +6,431 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmx.h File Reference

#include "gcstruct.h"
-#include "dmxclient.h"
-#include "globals.h"
-#include "scrnintstr.h"
-#include "picturestr.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  _DMXScreenInfo

Defines

#define DMX_WRAP(_entry, _newfunc, _saved, _actual)
#define DMX_UNWRAP(_entry, _saved, _actual)

Typedefs

typedef _DMXInputInfo DMXInputInfo
typedef _DMXStatInfo DMXStatInfo
typedef _DMXScreenInfo DMXScreenInfo

Variables

int dmxNumScreens
DMXScreenInfo * dmxScreens
int dmxShadowFB
XErrorEvent dmxLastErrorEvent
Bool dmxErrorOccurred
Bool dmxOffScreenOpt
Bool dmxSubdividePrimitives
Bool dmxLazyWindowCreation
Bool dmxUseXKB
int dmxDepth
Bool dmxNoRender
char * dmxFontPath
Bool dmxIgnoreBadFontPaths
Bool dmxAddRemoveScreens
-

Detailed Description

-Main header file included by all other DMX-related files.

Define Documentation

-

- - - - -
- + + +
+

dmx.h File Reference

#include "gcstruct.h"
+#include "dmxclient.h"
+#include "globals.h"
+#include "scrnintstr.h"
+#include "picturestr.h"
+ +

Go to the source code of this file.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _DMXScreenInfo

Defines

#define DMX_WRAP(_entry, _newfunc, _saved, _actual)
#define DMX_UNWRAP(_entry, _saved, _actual)

Typedefs

typedef struct _DMXInputInfo DMXInputInfo
typedef struct _DMXStatInfo DMXStatInfo
typedef struct _DMXScreenInfo DMXScreenInfo

Enumerations

enum  PositionType {
+  PosNone = -1, +PosAbsolute = 0, +PosRightOf, +PosLeftOf, +
+  PosAbove, +PosBelow, +PosRelative +
+ }

Variables

int dmxNumScreens
DMXScreenInfo * dmxScreens
int dmxShadowFB
XErrorEvent dmxLastErrorEvent
Bool dmxErrorOccurred
Bool dmxOffScreenOpt
Bool dmxSubdividePrimitives
Bool dmxLazyWindowCreation
Bool dmxUseXKB
int dmxDepth
char * dmxFontPath
Bool dmxIgnoreBadFontPaths
Bool dmxAddRemoveScreens
+

Detailed Description

+

Main header file included by all other DMX-related files.

+

Define Documentation

+ +
+
+ - - - - + + + + + + - + + + + + + + - - - -
#define DMX_UNWRAP( _entry,
#define DMX_UNWRAP(_entry,
_saved,
_saved,
_actual  )  _actual   )  +
-
- - - - - -
-   - - -

-Value:

do {                                                                    \
+
+
+Value:
do {                                                                    \
     (_actual)->_entry = (_saved)->_entry;                               \
 } while (0)
-
Unwrap screen or GC function pointer
-

- - - - -
- +

Unwrap screen or GC function pointer

+ +

Referenced by dmxChangeBorderWidth(), dmxChangePicture(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCloseConsoleScreen(), dmxCloseScreen(), dmxComposite(), dmxCompositeRects(), dmxCopyWindow(), dmxCreateColormap(), dmxCreateGC(), dmxCreatePicture(), dmxCreatePixmap(), dmxCreateWindow(), dmxDestroyColormap(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxInstallColormap(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSetShape(), dmxStoreColors(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxUnrealizeWindow(), dmxValidatePicture(), and dmxWindowExposures().

+ + + + +
+
+
- - - - - - + + + + + + + + + + - + + + + + + + - - - -
#define DMX_WRAP( _entry,
_newfunc,
#define DMX_WRAP(_entry,
_newfunc,
_saved,
_saved,
_actual  )  _actual   )  +
-
- - - - - -
-   - - -

-Value:

do {                                                                    \
+
+
+Value:
do {                                                                    \
     (_saved)->_entry  = (_actual)->_entry;                              \
     (_actual)->_entry = (_newfunc);                                     \
 } while (0)
-
Wrap screen or GC function pointer
-

Typedef Documentation

-

- - - - -
- +

Wrap screen or GC function pointer

+ +

Referenced by dmxChangeBorderWidth(), dmxChangePicture(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxComposite(), dmxCompositeRects(), dmxConsoleInit(), dmxCopyWindow(), dmxCreateColormap(), dmxCreateGC(), dmxCreatePicture(), dmxCreatePixmap(), dmxCreateWindow(), dmxDestroyColormap(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxInstallColormap(), dmxPictureInit(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxScreenInit(), dmxSetShape(), dmxStoreColors(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxUnrealizeWindow(), dmxValidatePicture(), and dmxWindowExposures().

+ + + +

Typedef Documentation

+ +
+
+
- +
typedef struct _DMXInputInfo DMXInputInfo + typedef struct _DMXInputInfo DMXInputInfo
-
- - - - - -
-   - - -

-Provide the typedef globally, but keep the contents opaque outside of the input routines.

See also:
dmxinput.h
-
-

- - - - -
- + +
+

Provide the typedef globally, but keep the contents opaque outside of the input routines.

+
See also:
dmxinput.h
+ +
+ + +
+
+
- +
typedef struct _DMXScreenInfo DMXScreenInfo + typedef struct _DMXScreenInfo DMXScreenInfo
-
- - - - - -
-   - - -

-Global structure containing information about each backend screen.

-

- - - - -
- + +
+

Global structure containing information about each backend screen.

+ +
+ + +
+
+
- +
typedef struct _DMXStatInfo DMXStatInfo + typedef struct _DMXStatInfo DMXStatInfo
-
- - - - - -
-   - - -

-Provide the typedef globally, but keep the contents opaque outside of the XSync statistic routines.

See also:
dmxstat.c
-
-

Variable Documentation

-

- - - - -
- + +
+

Provide the typedef globally, but keep the contents opaque outside of the XSync statistic routines.

+
See also:
dmxstat.c
+ +
+ +

Enumeration Type Documentation

+ +
+
+
- +
Bool dmxAddRemoveScreens + enum PositionType
-
- - - - - -
-   - - -

-True if add and remove screens support is enabled

-

- - - - -
- + +
+
Enumerator:
+ + + + + + + +
PosNone  +
PosAbsolute  +
PosRightOf  +
PosLeftOf  +
PosAbove  +
PosBelow  +
PosRelative  +
+ + + + + +

Variable Documentation

+ +
+
+ - +
int dmxDepth + Bool dmxAddRemoveScreens
-
- - - - - -
-   - - -

-Requested depth if non-zero

-

- - - - -
- + +
+

True if add and remove screens support is enabled

+ +

Referenced by ddxProcessArgument(), dmxAttachScreen(), dmxDetachScreen(), and InitOutput().

+ +
+ + +
+
+
- +
Bool dmxErrorOccurred + int dmxDepth
-
- - - - - -
-   - - -

-True if an error occurred

-

- - - - -
- + +
+

Requested depth if non-zero

+ +

Referenced by ddxProcessArgument(), and dmxGetVisualInfo().

+ +
+ + +
+
+
- +
char* dmxFontPath + Bool dmxErrorOccurred
-
- - - - - -
-   - - -

-NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths

-

- - - - -
- + +
+

True if an error occurred

+ +

Referenced by dmxErrorHandler().

+ +
+ + +
+
+
- +
Bool dmxIgnoreBadFontPaths + char* dmxFontPath
-
- - - - - -
-   - - -

-True if bad font paths should be ignored during server init

-

- - - - -
- + +
+

NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths

+ +

Referenced by dmxBELoadFont(), and dmxSetDefaultFontPath().

+ +
+ + +
+
+
- +
XErrorEvent dmxLastErrorEvent + Bool dmxIgnoreBadFontPaths
-
- - - - - -
-   - - -

-Last error that occurred

-

- - - - -
- + +
+

True if bad font paths should be ignored during server init

+ +

Referenced by ddxProcessArgument(), and dmxBELoadFont().

+ +
+ + +
+
+
- +
Bool dmxLazyWindowCreation + XErrorEvent dmxLastErrorEvent
-
- - - - - -
-   - - -

-True if using the lazy window creation optimization

-

- - - - -
- + +
+

Last error that occurred

+ +

Referenced by dmxErrorHandler().

+ +
+ + +
+
+
- +
Bool dmxNoRender + Bool dmxLazyWindowCreation
-
- - - - - -
-   - - -

-True if the RENDER extension should be disabled

-

- - - - -
- + +
+

True if using the lazy window creation optimization

+ +

Referenced by ddxProcessArgument(), dmxCreateWindow(), and InitOutput().

+ +
+ + +
+
+
- +
int dmxNumScreens + int dmxNumScreens
-
- - - - - -
-   - - -

-Number of dmxScreens

-

- - - - -
- + +
+

Number of dmxScreens

+ +

Referenced by AbortDDX(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), dmxCheckCursor(), dmxComputeScreenOrigins(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigConfigInputs(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConfigSetMaxScreens(), dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), dmxConsoleDrawWindows(), dmxCursorOffScreen(), dmxFindFirstScreen(), dmxFindPointerScreen(), dmxGetNumScreens(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxInitOverlap(), dmxInputAttachBackend(), dmxInputInit(), dmxProcRenderAddGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcSetFontPath(), dmxPropertyCheckOtherWindows(), dmxReInitOrigins(), dmxSLCreate(), dmxSLFindNext(), dmxStatCallback(), dmxSyncCallback(), dmxTryComputeScreenOrigins(), and InitOutput().

+ +
+ + +
+
+
- +
Bool dmxOffScreenOpt + Bool dmxOffScreenOpt
-
- - - - - -
-   - - -

-True if using off screen optimizations

-

- - - - -
- + +
+

True if using off screen optimizations

+ +

Referenced by ddxProcessArgument(), and InitOutput().

+ +
+ + +
+
+
- +
DMXScreenInfo* dmxScreens + DMXScreenInfo* dmxScreens
-
- - - - - -
-   - - -

-List of outputs

-

- - - - -
- + +
+

List of outputs

+ +

Referenced by _dmxMoveCursor(), _dmxRealizeCursor(), _dmxSetCursor(), _dmxUnrealizeCursor(), dmxAttachScreen(), dmxBackendFindOverlapping(), dmxBackendInitPrivate(), dmxBackendOffscreen(), dmxBackendProcessInput(), dmxBackendUpdatePosition(), dmxBECloseScreen(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBECreateGC(), dmxBECreateGlyphSet(), dmxBECreatePixmap(), dmxBECreateWindowTree(), dmxBEDestroyWindow(), dmxBEFreeColormap(), dmxBEFreeCursor(), dmxBEFreeFont(), dmxBEFreeGC(), dmxBEFreeGlyphSet(), dmxBEFreePicture(), dmxBEFreePixmap(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBESavePixmap(), dmxBEScreenInit(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeClip(), dmxChangeGC(), dmxChangePicture(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCheckCursor(), dmxCloseScreen(), dmxColormapFromDefaultVisual(), dmxCommonMouOn(), dmxCommonSaveState(), dmxComposite(), dmxCompositeRects(), dmxComputeScreenOrigins(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigConfigInputs(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConnectionBlockCallback(), dmxConsoleDraw(), dmxCopyArea(), dmxCopyGC(), dmxCopyPlane(), dmxCopyWindow(), dmxCoreMotion(), dmxCreateAndRealizeWindow(), dmxCreateColormap(), dmxCreateGC(), dmxCreateNonRootWindow(), dmxCreatePicture(), dmxCreatePixmap(), dmxCreateRootWindow(), dmxCreateWindow(), dmxCursorOffScreen(), dmxDestroyClip(), dmxDestroyColormap(), dmxDestroyGC(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxDetachScreen(), dmxDoCreatePicture(), dmxDoRestackWindow(), dmxDoSetShape(), dmxFillPolygon(), dmxFindAlternatePixmap(), dmxFindFirstScreen(), dmxGetImage(), dmxGetScreenAttributes(), dmxImageText16(), dmxImageText8(), dmxInitOrigins(), dmxInitOverlap(), dmxInputAttachBackend(), dmxInputInit(), dmxInstallColormap(), dmxLookupVisual(), dmxLookupVisualFromID(), dmxMoveCursor(), dmxPictureInit(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPositionWindow(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxProcSetFontPath(), dmxPropertyCheckOtherWindows(), dmxPutImage(), dmxRealizeCursor(), dmxRealizeFont(), dmxRealizeWindow(), dmxReInitOrigins(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeScreenWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxScreenInit(), dmxSetCursor(), dmxSetShape(), dmxShadowUpdateProc(), dmxStatCallback(), dmxStoreColors(), dmxSyncCallback(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxTryComputeScreenOrigins(), dmxUnrealizeCursor(), dmxUnrealizeFont(), dmxUnrealizeWindow(), dmxUpdateScreenResources(), dmxValidatePicture(), and dmxWindowExposures().

+ +
+ + +
+
+
- +
int dmxShadowFB + int dmxShadowFB
-
- - - - - -
-   - - -

-Non-zero if using shadow frame-buffer (deprecated)

-

- - - - -
- + +
+

Non-zero if using shadow frame-buffer (deprecated)

+ +

Referenced by ddxProcessArgument(), dmxBECloseScreen(), dmxBEScreenInit(), dmxCloseScreen(), dmxCommonMouOn(), dmxPictureInit(), dmxScreenInit(), and InitOutput().

+ +
+ + +
+
+
- +
Bool dmxSubdividePrimitives + Bool dmxSubdividePrimitives
-
- - - - - -
-   - - -

-True if using the primitive subdivision optimization

-

- - - - -
- + +
+

True if using the primitive subdivision optimization

+ +

Referenced by ddxProcessArgument(), and dmxPutImage().

+ +
+ + +
+
+
- +
Bool dmxUseXKB + Bool dmxUseXKB
-
- - - - - -
-   - - -

-True if the XKB extension should be used with the backend servers

+ +

+

True if the XKB extension should be used with the backend servers

+ +

Referenced by ddxProcessArgument(), and dmxCommonSaveState().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmx_8h_source.html b/xorg-server/hw/dmx/doc/html/dmx_8h_source.html new file mode 100644 index 000000000..ce2f78e50 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmx_8h_source.html @@ -0,0 +1,327 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html deleted file mode 100644 index 1885e30d7..000000000 --- a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmx_glxvisuals.h

00001 /*
-00002 ** License Applicability. Except to the extent portions of this file are
-00003 ** made subject to an alternative license as permitted in the SGI Free
-00004 ** Software License B, Version 1.1 (the "License"), the contents of this
-00005 ** file are subject only to the provisions of the License. You may not use
-00006 ** this file except in compliance with the License. You may obtain a copy
-00007 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-00008 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-00009 **
-00010 ** http://oss.sgi.com/projects/FreeB
-00011 **
-00012 ** Note that, as provided in the License, the Software is distributed on an
-00013 ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-00014 ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-00015 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-00016 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-00017 **
-00018 ** Original Code. The Original Code is: OpenGL Sample Implementation,
-00019 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-00020 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-00021 ** Copyright in any portions created by third parties is as indicated
-00022 ** elsewhere herein. All Rights Reserved.
-00023 **
-00024 ** Additional Notice Provisions: The application programming interfaces
-00025 ** established by SGI in conjunction with the Original Code are The
-00026 ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-00027 ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-00028 ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-00029 ** Window System(R) (Version 1.3), released October 19, 1998. This software
-00030 ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-00031 ** published by SGI, but has not been independently verified as being
-00032 ** compliant with the OpenGL(R) version 1.2.1 Specification.
-00033 **
-00034 */
-00035 
-00036 #ifndef _GLXVISUALS_H
-00037 #define _GLXVISUALS_H
-00038 
-00039 #include <GL/glxint.h>
-00040 
-00042 typedef struct {
-00043     int x_visual_depth;
-00044     int x_visual_class;
-00045 } dmxGlxVisualPrivate;
-00046 
-00047 __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy,
-00048                                        int screen,
-00049                                        int *nconfigs);
-00050 
-00051 __GLXFBConfig *GetGLXFBConfigs(Display *dpy,
-00052                                int glxMajorOpcode,
-00053                                int *nconfigs);
-00054 
-00055 __GLXvisualConfig *GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, 
-00056                                                     int nfbconfigs, 
-00057                                                     XVisualInfo *visuals,
-00058                                                     int nvisuals,
-00059                                                     __GLXvisualConfig
-00060                                                     *glxConfigs,
-00061                                                     int nGlxConfigs,
-00062                                                     int *nconfigs);
-00063 
-00064 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html new file mode 100644 index 000000000..cd0361f9b --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html @@ -0,0 +1,94 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8c.html b/xorg-server/hw/dmx/doc/html/dmxarg_8c.html index db05599a6..ae8912a7e 100644 --- a/xorg-server/hw/dmx/doc/html/dmxarg_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxarg_8c.html @@ -6,225 +6,214 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxarg.c File Reference

#include "dmx.h"
-#include "dmxarg.h"
-#include <stdio.h>
-#include <string.h>
- - - - - - - - - - - - - - - - - - + + +
+

dmxarg.c File Reference

#include "dmx.h"
+#include "dmxarg.h"
+#include <stdio.h>
+#include <string.h>
+

Data Structures

struct  _dmxArg

Functions

dmxArg dmxArgCreate (void)
void dmxArgFree (dmxArg a)
void dmxArgAdd (dmxArg a, const char *string)
const char * dmxArgV (dmxArg a, int item)
int dmxArgC (dmxArg a)
dmxArg dmxArgParse (const char *string)
+ + + + + + + + + + +

Data Structures

struct  _dmxArg

Defines

#define DMX_ARG_TEST   0

Functions

dmxArg dmxArgCreate (void)
void dmxArgFree (dmxArg a)
void dmxArgAdd (dmxArg a, const char *string)
const char * dmxArgV (dmxArg a, int item)
int dmxArgC (dmxArg a)
dmxArg dmxArgParse (const char *string)
-

Detailed Description

-Generic comma-delimited argument processing.

Function Documentation

-

- - - - -
- +

Detailed Description

+

Generic comma-delimited argument processing.

+

Define Documentation

+ +
+
+
- - - - + +
void dmxArgAdd ( dmxArg  a, #define DMX_ARG_TEST   0
+ +
+ +
+ +

Function Documentation

+ +
+
+ + + + + + + + - - - + + - - + + -
void dmxArgAdd (dmxArg  a,
const char *  stringconst char *  string 
) )
-
- - - - - -
-   - - -

-Add the string as the next argument in the dmxArg object.

-

- - - - -
- + +
+

Add the string as the next argument in the dmxArg object.

+ +

References _dmxArg::argc, _dmxArg::argm, and _dmxArg::argv.

+ +

Referenced by dmxArgParse().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxArgC ( dmxArg  a  ) int dmxArgC (dmxArg  a ) 
-
- - - - - -
-   - - -

-Return the number of arguments in the dmxArg object.

-

- - - - -
- + +
+

Return the number of arguments in the dmxArg object.

+ +

References _dmxArg::argc.

+ +

Referenced by dmxInputInit(), and dmxPopulateLocal().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxArg dmxArgCreate ( void   ) dmxArg dmxArgCreate (void  ) 
-
- - - - - -
-   - - -

-Create an (externally opaque) dmxArg object.

-

- - - - -
- + +
+

Create an (externally opaque) dmxArg object.

+ +

References _dmxArg::argc, _dmxArg::argm, and _dmxArg::argv.

+ +

Referenced by dmxArgParse().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxArgFree ( dmxArg  a  ) void dmxArgFree (dmxArg  a ) 
-
- - - - - -
-   - - -

-Free the specified dmxArg object.

-

- - - - -
- + +
+

Free the specified dmxArg object.

+ +

References _dmxArg::argc, and _dmxArg::argv.

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxArg dmxArgParse ( const char *  string  ) dmxArg dmxArgParse (const char *  string ) 
-
- - - - - -
-   - - -

-Parse a string into arguments delimited by commas. Return a new dmxArg object containing the arguments.

-

- - - - -
- + +
+

Parse a string into arguments delimited by commas. Return a new dmxArg object containing the arguments.

+ +

References dmxArgAdd(), and dmxArgCreate().

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
const char* dmxArgV ( dmxArg  a, const char* dmxArgV (dmxArg  a,
int  itemint  item 
) )
-
- - - - - -
-   - - -

-Return the argument number item in the dmxArg object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.

+ +

+

Return the argument number item in the dmxArg object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.

+ +

References _dmxArg::argc, and _dmxArg::argv.

+ +

Referenced by dmxInputInit(), and dmxPopulateLocal().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html deleted file mode 100644 index 1f2fbce39..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxarg.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXARG_H_
-00039 #define _DMXARG_H_
-00040 
-00041 typedef struct _dmxArg *dmxArg;
-00042 
-00043 extern dmxArg     dmxArgCreate(void);
-00044 extern void       dmxArgFree(dmxArg a);
-00045 extern void       dmxArgAdd(dmxArg a, const char *string);
-00046 extern const char *dmxArgV(dmxArg a, int item);
-00047 extern int        dmxArgC(dmxArg a);
-00048 extern dmxArg     dmxArgParse(const char *string);
-00049 
-00050 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h.html index 41fd707e9..6446dfb48 100644 --- a/xorg-server/hw/dmx/doc/html/dmxarg_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxarg_8h.html @@ -6,221 +6,211 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxarg.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

dmxArg dmxArgCreate (void)
void dmxArgFree (dmxArg a)
void dmxArgAdd (dmxArg a, const char *string)
const char * dmxArgV (dmxArg a, int item)
int dmxArgC (dmxArg a)
dmxArg dmxArgParse (const char *string)
+ + + + + + + + +

Typedefs

typedef struct _dmxArg * dmxArg

Functions

dmxArg dmxArgCreate (void)
void dmxArgFree (dmxArg a)
void dmxArgAdd (dmxArg a, const char *string)
const char * dmxArgV (dmxArg a, int item)
int dmxArgC (dmxArg a)
dmxArg dmxArgParse (const char *string)
-

Detailed Description

-Interface to argument handling functions.
See also:
dmxarg.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to argument handling functions.

+
See also:
dmxarg.c
+

Typedef Documentation

+ +
+
+
- - - - + +
void dmxArgAdd ( dmxArg  a, typedef struct _dmxArg* dmxArg
+ +
+ +
+ +

Function Documentation

+ +
+
+ + + + + + + + - - - + + - - + + -
void dmxArgAdd (dmxArg  a,
const char *  stringconst char *  string 
) )
-
- - - - - -
-   - - -

-Add the string as the next argument in the dmxArg object.

-

- - - - -
- + +
+

Add the string as the next argument in the dmxArg object.

+ +

References _dmxArg::argc, _dmxArg::argm, and _dmxArg::argv.

+ +

Referenced by dmxArgParse().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxArgC ( dmxArg  a  ) int dmxArgC (dmxArg  a ) 
-
- - - - - -
-   - - -

-Return the number of arguments in the dmxArg object.

-

- - - - -
- + +
+

Return the number of arguments in the dmxArg object.

+ +

References _dmxArg::argc.

+ +

Referenced by dmxInputInit(), and dmxPopulateLocal().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxArg dmxArgCreate ( void   ) dmxArg dmxArgCreate (void  ) 
-
- - - - - -
-   - - -

-Create an (externally opaque) dmxArg object.

-

- - - - -
- + +
+

Create an (externally opaque) dmxArg object.

+ +

References _dmxArg::argc, _dmxArg::argm, and _dmxArg::argv.

+ +

Referenced by dmxArgParse().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxArgFree ( dmxArg  a  ) void dmxArgFree (dmxArg  a ) 
-
- - - - - -
-   - - -

-Free the specified dmxArg object.

-

- - - - -
- + +
+

Free the specified dmxArg object.

+ +

References _dmxArg::argc, and _dmxArg::argv.

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxArg dmxArgParse ( const char *  string  ) dmxArg dmxArgParse (const char *  string ) 
-
- - - - - -
-   - - -

-Parse a string into arguments delimited by commas. Return a new dmxArg object containing the arguments.

-

- - - - -
- + +
+

Parse a string into arguments delimited by commas. Return a new dmxArg object containing the arguments.

+ +

References dmxArgAdd(), and dmxArgCreate().

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
const char* dmxArgV ( dmxArg  a, const char* dmxArgV (dmxArg  a,
int  itemint  item 
) )
-
- - - - - -
-   - - -

-Return the argument number item in the dmxArg object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.

+

+
+

Return the argument number item in the dmxArg object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.

+ +

References _dmxArg::argc, and _dmxArg::argv.

+ +

Referenced by dmxInputInit(), and dmxPopulateLocal().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html new file mode 100644 index 000000000..c48d76d06 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html @@ -0,0 +1,82 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html index 1fde71a99..d2bf63f5f 100644 --- a/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html @@ -6,413 +6,1173 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxbackend.c File Reference

#include "dmxinputinit.h"
-#include "dmxbackend.h"
-#include "dmxcommon.h"
-#include "dmxconsole.h"
-#include "dmxcursor.h"
-#include "dmxprop.h"
-#include "dmxsync.h"
-#include "dmxcb.h"
-#include "dmxevents.h"
-#include "ChkNotMaskEv.h"
-#include "inputstr.h"
-#include "input.h"
-#include "keysym.h"
-#include "mipointer.h"
-#include "scrnintstr.h"
-#include "windowstr.h"
- - - - + + +
+

dmxbackend.c File Reference

#include "dmxinputinit.h"
+#include "dmxbackend.h"
+#include "dmxcommon.h"
+#include "dmxconsole.h"
+#include "dmxcursor.h"
+#include "dmxprop.h"
+#include "dmxsync.h"
+#include "dmxcb.h"
+#include "dmxevents.h"
+#include "ChkNotMaskEv.h"
+#include "inputstr.h"
+#include "input.h"
+#include <X11/keysym.h>
+#include "mipointer.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define DMX_BACKEND_DEBUG   0
#define DMXDBG0(f)
#define DMXDBG1(f, a)
#define DMXDBG2(f, a, b)
#define DMXDBG3(f, a, b, c)
#define DMXDBG4(f, a, b, c, d)
#define DMXDBG5(f, a, b, c, d, e)
#define DMXDBG6(f, a, b, c, d, e, g)
#define DMXDBG7(f, a, b, c, d, e, g, h)
#define DMXDBG8(f, a, b, c, d, e, g, h, i)
#define DMXDBG9(f, a, b, c, d, e, g, h, i, j)

Typedefs

typedef struct _myPrivate myPrivate

Functions

pointer dmxBackendCreatePrivate (DeviceIntPtr pDevice)
void dmxBackendDestroyPrivate (pointer private)
static void * dmxBackendTestScreen (DMXScreenInfo *dmxScreen, void *closure)
static int dmxBackendSameDisplay (myPrivate *priv, long screen)
static void * dmxBackendTestEvents (DMXScreenInfo *dmxScreen, void *closure)
static void * dmxBackendTestMotionEvent (DMXScreenInfo *dmxScreen, void *closure)
static DMXScreenInfo * dmxBackendGetEvent (myPrivate *priv, XEvent *X)
static DMXScreenInfo * dmxBackendPendingMotionEvent (myPrivate *priv, int save)
static void * dmxBackendTestWindow (DMXScreenInfo *dmxScreen, void *closure)
static DMXScreenInfo * dmxBackendFindWindow (myPrivate *priv, Window win)
static int dmxBackendFindOverlapping (myPrivate *priv, int screen, int x, int y)
static int dmxBackendOffscreen (int screen, int x, int y)
void dmxBackendUpdatePosition (pointer private, int x, int y)
void dmxBackendCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void dmxBackendProcessInput (pointer private)
static void dmxBackendComputeCenter (myPrivate *priv)
static DMXScreenInfo * dmxBackendInitPrivate (DevicePtr pDev)
void dmxBackendLateReInit (DevicePtr pDev)
void dmxBackendInit (DevicePtr pDev)
void dmxBackendMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxBackendKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int dmxBackendFunctions (pointer private, DMXFunctionType function)
+

Detailed Description

+

These routines support taking input from devices on the backend (output) displays.

+
See also:
dmxcommon.c.
+

Define Documentation

+ +
+
+ + + + +
#define DMX_BACKEND_DEBUG   0
+
+
-

Functions

-pointer dmxBackendCreatePrivate (DeviceIntPtr pDevice) +
+
+ +
+
+ + + + + + + + + +
#define DMXDBG0(f  ) 
+
+
-void dmxBackendDestroyPrivate (pointer private) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define DMXDBG1(f,
a  ) 
+
+
-void dmxBackendUpdatePosition (pointer private, int x, int y) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define DMXDBG2(f,
a,
b  ) 
+
+
-void dmxBackendCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG3(f,
a,
b,
c  ) 
+
+
-void dmxBackendProcessInput (pointer private) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG4(f,
a,
b,
c,
d  ) 
+
+
-void dmxBackendLateReInit (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG5(f,
a,
b,
c,
d,
e  ) 
+
+
-void dmxBackendInit (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG6(f,
a,
b,
c,
d,
e,
g  ) 
+
+
-void dmxBackendMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG7(f,
a,
b,
c,
d,
e,
g,
h  ) 
+
+
-void dmxBackendKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG8(f,
a,
b,
c,
d,
e,
g,
h,
i  ) 
+
+
-int dmxBackendFunctions (pointer private, DMXFunctionType function) +

Referenced by dmxBackendCollectEvents().

- -

Detailed Description

-These routines support taking input from devices on the backend (output) displays.
See also:
dmxcommon.c.
-

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + + + + - - + + + + + + - - + + + + + + - - + + + + + + - - + + + + + + - - +
void dmxBackendCollectEvents ( DevicePtr  pDev, #define DMXDBG9(f,
a,
dmxMotionProcPtr  motion, b,
c,
dmxEnqueueProcPtr  enqueue, d,
e,
dmxCheckSpecialProcPtr  checkspecial, g,
h,
DMXBlockType  blocki,
j  )  ) 
+ +
+

Referenced by dmxBackendCollectEvents(), and dmxBackendUpdatePosition().

+ +
+ +

Typedef Documentation

+ +
+
+ + + +
typedef struct _myPrivate myPrivate
-
- - - - - -
-   - - -

-Get events from the X queue on the backend servers and put the events into the DMX event queue.

-

- - - - -
- + +
+ +
+ +

Function Documentation

+ +
+
+
+ + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxBackendCollectEvents (DevicePtr  pDev,
pointer dmxBackendCreatePrivate ( DeviceIntPtr  pDevice  ) dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
+ +
+

Get events from the X queue on the backend servers and put the events into the DMX event queue.

+

References _DMXScreenInfo::beDisplay, DMX_ABSOLUTE, DMX_RELATIVE, dmxBackendFindWindow(), dmxBackendGetEvent(), dmxBackendPendingMotionEvent(), dmxCommonRestoreState(), dmxCommonSaveState(), DMXDBG2, DMXDBG4, DMXDBG5, DMXDBG7, DMXDBG8, DMXDBG9, dmxError, dmxFatal, dmxLog(), dmxSync(), GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _DMXScreenInfo::index, _DMXScreenInfo::name, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, and _DMXScreenInfo::scrnWin.

+ +
+ + +
+
+ + + + + + + + +
static void dmxBackendComputeCenter (myPrivate *  priv )  [static]
-
- - - - - -
-   - - -

-Create and return a private data structure.

-

- - - - -
- + +
+ +

References _myPrivate::centerX, and _myPrivate::centerY.

+ +

Referenced by dmxBackendInit(), and dmxBackendLateReInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxBackendDestroyPrivate ( pointer  private  ) pointer dmxBackendCreatePrivate (DeviceIntPtr  pDevice ) 
+ +
+

Create and return a private data structure.

+ +

References GETDMXLOCALFROMPDEVICE.

+
+ + +
+
+ + + + + + + + +
void dmxBackendDestroyPrivate (pointer  private ) 
-
- - - - - -
-   - - -

-Destroy the private data structure. No checking is performed to verify that the structure was actually created by dmxBackendCreatePrivate.

-

- - - - -
- + +
+

Destroy the private data structure. No checking is performed to verify that the structure was actually created by dmxBackendCreatePrivate.

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + - - + + + + + + + -
int dmxBackendFunctions ( pointer  private, static int dmxBackendFindOverlapping (myPrivate *  priv,
int  screen,
DMXFunctionType  functionint  x,
) int  y 
) [static]
-
- - - - - -
-   - - -

-Process #DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.

-

- - - - -
- + +
+ +

References dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _myPrivate::myScreen, and _DMXScreenInfo::over.

+ +

Referenced by dmxBackendUpdatePosition().

+ +
+ + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
static DMXScreenInfo* dmxBackendFindWindow (myPrivate *  priv,
Window  win 
void dmxBackendInit ( DevicePtr  pDev  ) ) [static]
+ +
+ +

References dmxBackendTestWindow(), and dmxPropertyIterate().

+ +

Referenced by dmxBackendCollectEvents().

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
int dmxBackendFunctions (pointer  private,
DMXFunctionType  function 
)
-
- - - - - -
-   - - -

-Initialized the backend device described by pDev.

-

- - - - -
- + +
+

Process DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.

+ +

References DMX_FUNCTION_TERMINATE.

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
void dmxBackendKbdGetInfo ( DevicePtr  pDev, static DMXScreenInfo* dmxBackendGetEvent (myPrivate *  priv,
XEvent *  X 
DMXLocalInitInfoPtr  info) [static]
+ +
+ +

References dmxBackendTestEvents(), and dmxPropertyIterate().

+ +

Referenced by dmxBackendCollectEvents().

+ +
+ + +
+
+ + + + + + - - +
void dmxBackendInit (DevicePtr  pDev )  ) 
+
+
+

Initialized the backend device described by pDev.

+

References DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxBackendComputeCenter(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), GETPRIVFROMPDEV, and _DMXScreenInfo::index.

+ +
+
+ +
+
+ + + + + + + + +
static DMXScreenInfo* dmxBackendInitPrivate (DevicePtr  pDev )  [static]
-
- - - - - -
-   - - -

-Get information about the backend keyboard (for initialization).

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, dmxFatal, dmxInputs, dmxLog(), dmxNumScreens, dmxPropertySameDisplay(), dmxScreens, GETPRIVFROMPDEV, _DMXInputInfo::name, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBackendInit(), dmxBackendLateReInit(), and dmxBackendMouGetInfo().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + +
void dmxBackendLateReInit ( DevicePtr  pDev  ) void dmxBackendKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
+ +
+

Get information about the backend keyboard (for initialization).

+ +

References dmxCommonKbdGetInfo(), dmxCommonKbdGetMap(), _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+
+ + +
+
+ + + + + + + + +
void dmxBackendLateReInit (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Re-initialized the backend device described by pDev (after a reconfig).

-

- - - - -
- + +
+

Re-initialized the backend device described by pDev (after a reconfig).

+ +

References dmxBackendComputeCenter(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), dmxBackendUpdatePosition(), DMXDBG1, dmxGetGlobalPosition(), dmxInvalidateGlobalPosition(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + + +
void dmxBackendMouGetInfo ( DevicePtr  pDev, void dmxBackendMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
DMXLocalInitInfoPtr  info)
+ +
+

Get information about the backend pointer (for initialization).

+ +

References _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, _DMXLocalInitInfo::buttonClass, dmxBackendInitPrivate(), dmxCommonMouGetMap(), _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + + - - + + + + + + + + + + + + + +
static int dmxBackendOffscreen (int  screen,
) int  x,
int  y 
) [static]
+
+
+ +

References dmxOnScreen(), and dmxScreens.

+ +

Referenced by dmxBackendUpdatePosition().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static DMXScreenInfo* dmxBackendPendingMotionEvent (myPrivate *  priv,
int  save 
) [static]
-
- - - - - -
-   - - -

-Get information about the backend pointer (for initialization).

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, dmxBackendTestMotionEvent(), and dmxPropertyIterate().

+ +

Referenced by dmxBackendCollectEvents(), and dmxBackendUpdatePosition().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxBackendProcessInput ( pointer  private  ) void dmxBackendProcessInput (pointer  private ) 
+ +
+

Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.

+ +

References DMXDBG4, DMXDBG6, dmxScreens, dmxSync(), and GETPRIVFROMPRIVATE.

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
static int dmxBackendSameDisplay (myPrivate *  priv,
long  screen 
) [static]
-
- - - - - -
-   - - -

-Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.

-

- - - - -
- + +
+ +

References dmxBackendTestScreen(), dmxNumScreens, dmxPropertyIterate(), and _myPrivate::myScreen.

+ +

Referenced by dmxBackendInit(), dmxBackendLateReInit(), and dmxBackendUpdatePosition().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + +
static void* dmxBackendTestEvents (DMXScreenInfo *  dmxScreen,
void *  closure 
) [static]
+ +
+ +

References _DMXScreenInfo::beDisplay, and XCheckNotMaskEvent().

+ +

Referenced by dmxBackendGetEvent().

+ +
+ + +
+
+ - - - - + + + + + + + + + + + + + +
void dmxBackendUpdatePosition ( pointer  private, static void* dmxBackendTestMotionEvent (DMXScreenInfo *  dmxScreen,
void *  closure 
) [static]
+
+
+ +

References _DMXScreenInfo::beDisplay.

+ +

Referenced by dmxBackendPendingMotionEvent().

+ +
+
+ +
+
+ + + + + + + + + - - + + + + + +
static void* dmxBackendTestScreen (DMXScreenInfo *  dmxScreen,
int  x, void *  closure 
) [static]
+
+
+ +

References _DMXScreenInfo::index.

+ +

Referenced by dmxBackendSameDisplay().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static void* dmxBackendTestWindow (DMXScreenInfo *  dmxScreen,
int  yvoid *  closure 
) ) [static]
+
+
+ +

References _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBackendFindWindow().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
void dmxBackendUpdatePosition (pointer  private,
int  x,
int  y 
)
-
- - - - - -
-   - - -

-This routine is called from #dmxCoreMotion for each motion event. #x and #y are global coordinants.

+

+
+

This routine is called from dmxCoreMotion for each motion event. x and y are global coordinants.

+ +

References dmxBackendFindOverlapping(), dmxBackendOffscreen(), dmxBackendPendingMotionEvent(), dmxBackendSameDisplay(), dmxCheckCursor(), dmxConsoleCapture(), dmxConsoleUncapture(), DMXDBG0, DMXDBG2, DMXDBG5, DMXDBG9, dmxHideCursor(), dmxScreens, dmxSync(), and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendLateReInit().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html deleted file mode 100644 index 9b58dac3e..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxbackend.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00039 #ifndef _DMXBACKEND_H_
-00040 #define _DMXBACKEND_H_
-00041 
-00042 extern pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice);
-00043 extern void    dmxBackendDestroyPrivate(pointer private);
-00044 extern void    dmxBackendInit(DevicePtr pDev);
-00045 extern void    dmxBackendLateReInit(DevicePtr pDev);
-00046 extern void    dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00047 extern void    dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00048 extern void    dmxBackendCollectEvents(DevicePtr pDev,
-00049                                        dmxMotionProcPtr motion,
-00050                                        dmxEnqueueProcPtr enqueue,
-00051                                        dmxCheckSpecialProcPtr checkspecial,
-00052                                        DMXBlockType block);
-00053 extern void    dmxBackendProcessInput(pointer private);
-00054 extern int     dmxBackendFunctions(pointer private, DMXFunctionType function);
-00055 extern void    dmxBackendUpdatePosition(pointer private, int x, int y);
-00056 
-00057 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html index 2a601be0c..ace4261c4 100644 --- a/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html @@ -6,397 +6,324 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxbackend.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer dmxBackendCreatePrivate (DeviceIntPtr pDevice)
void dmxBackendDestroyPrivate (pointer private)
void dmxBackendInit (DevicePtr pDev)
void dmxBackendLateReInit (DevicePtr pDev)
void dmxBackendMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxBackendKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxBackendCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void dmxBackendProcessInput (pointer private)
int dmxBackendFunctions (pointer private, DMXFunctionType function)
void dmxBackendUpdatePosition (pointer private, int x, int y)
+ + + + + + + + + + +

Functions

pointer dmxBackendCreatePrivate (DeviceIntPtr pDevice)
void dmxBackendDestroyPrivate (pointer private)
void dmxBackendInit (DevicePtr pDev)
void dmxBackendLateReInit (DevicePtr pDev)
void dmxBackendMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxBackendKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxBackendCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void dmxBackendProcessInput (pointer private)
int dmxBackendFunctions (pointer private, DMXFunctionType function)
void dmxBackendUpdatePosition (pointer private, int x, int y)
-

Detailed Description

-Interface to backend input device support.
See also:
dmxbackend.c

-dmxcommon.c

-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to backend input device support.

+
See also:
dmxbackend.c
+
+dmxcommon.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxBackendCollectEvents ( DevicePtr  pDev, void dmxBackendCollectEvents (DevicePtr  pDev,
dmxMotionProcPtr  motion, dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue, dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial, dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  blockDMXBlockType  block 
) )
-
- - - - - -
-   - + +
+

Get events from the X queue on the backend servers and put the events into the DMX event queue.

-

-Get events from the X queue on the backend servers and put the events into the DMX event queue.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_ABSOLUTE, DMX_RELATIVE, dmxBackendFindWindow(), dmxBackendGetEvent(), dmxBackendPendingMotionEvent(), dmxCommonRestoreState(), dmxCommonSaveState(), DMXDBG2, DMXDBG4, DMXDBG5, DMXDBG7, DMXDBG8, DMXDBG9, dmxError, dmxFatal, dmxLog(), dmxSync(), GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _DMXScreenInfo::index, _DMXScreenInfo::name, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, and _DMXScreenInfo::scrnWin.

+ + + + +
+
+
- - - - - - + + + + + + -
pointer dmxBackendCreatePrivate ( DeviceIntPtr  pDevice  ) pointer dmxBackendCreatePrivate (DeviceIntPtr  pDevice ) 
-
- - - - - -
-   - + +
+

Create and return a private data structure.

-

-Create and return a private data structure.

-

- - - - -
- +

References GETDMXLOCALFROMPDEVICE.

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxBackendDestroyPrivate ( pointer  private  ) void dmxBackendDestroyPrivate (pointer  private ) 
-
- - - - - -
-   - + +
+

Destroy the private data structure. No checking is performed to verify that the structure was actually created by dmxBackendCreatePrivate.

-

-Destroy the private data structure. No checking is performed to verify that the structure was actually created by dmxBackendCreatePrivate.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxBackendFunctions ( pointer  private, int dmxBackendFunctions (pointer  private,
DMXFunctionType  functionDMXFunctionType  function 
) )
-
- - - - - -
-   - + +
+

Process DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.

-

-Process #DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.

-

- - - - -
- +

References DMX_FUNCTION_TERMINATE.

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxBackendInit ( DevicePtr  pDev  ) void dmxBackendInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialized the backend device described by pDev.

-

-Initialized the backend device described by pDev.

-

- - - - -
- +

References DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxBackendComputeCenter(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), GETPRIVFROMPDEV, and _DMXScreenInfo::index.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxBackendKbdGetInfo ( DevicePtr  pDev, void dmxBackendKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Get information about the backend keyboard (for initialization).

-

-Get information about the backend keyboard (for initialization).

-

- - - - -
- +

References dmxCommonKbdGetInfo(), dmxCommonKbdGetMap(), _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxBackendLateReInit ( DevicePtr  pDev  ) void dmxBackendLateReInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Re-initialized the backend device described by pDev (after a reconfig).

-

-Re-initialized the backend device described by pDev (after a reconfig).

-

- - - - -
- +

References dmxBackendComputeCenter(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), dmxBackendUpdatePosition(), DMXDBG1, dmxGetGlobalPosition(), dmxInvalidateGlobalPosition(), and GETPRIVFROMPDEV.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxBackendMouGetInfo ( DevicePtr  pDev, void dmxBackendMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Get information about the backend pointer (for initialization).

-

-Get information about the backend pointer (for initialization).

-

- - - - -
- +

References _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, _DMXLocalInitInfo::buttonClass, dmxBackendInitPrivate(), dmxCommonMouGetMap(), _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxBackendProcessInput ( pointer  private  ) void dmxBackendProcessInput (pointer  private ) 
-
- - - - - -
-   - + +
+

Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.

-

-Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.

-

- - - - -
- +

References DMXDBG4, DMXDBG6, dmxScreens, dmxSync(), and GETPRIVFROMPRIVATE.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxBackendUpdatePosition ( pointer  private, void dmxBackendUpdatePosition (pointer  private,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - + +
+

This routine is called from dmxCoreMotion for each motion event. x and y are global coordinants.

-

-This routine is called from #dmxCoreMotion for each motion event. #x and #y are global coordinants.

+

References dmxBackendFindOverlapping(), dmxBackendOffscreen(), dmxBackendPendingMotionEvent(), dmxBackendSameDisplay(), dmxCheckCursor(), dmxConsoleCapture(), dmxConsoleUncapture(), DMXDBG0, DMXDBG2, DMXDBG5, DMXDBG9, dmxHideCursor(), dmxScreens, dmxSync(), and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendLateReInit().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html new file mode 100644 index 000000000..8e43b858f --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html @@ -0,0 +1,88 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8c.html b/xorg-server/hw/dmx/doc/html/dmxcb_8c.html index 072c3ff06..99916930b 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcb_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxcb_8c.html @@ -6,170 +6,166 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcb.c File Reference

#include "dmx.h"
-#include "dmxcb.h"
-#include "dmxinput.h"
-#include "dmxlog.h"
- - - - - - - - - - - - - - + + +
+

dmxcb.c File Reference

#include "dmx.h"
+#include "dmxcb.h"
+#include "dmxinput.h"
+#include "dmxlog.h"
+

Functions

void dmxSetWidthHeight (int width, int height)
void dmxComputeWidthHeight (DMXRecomputeFlag flag)
void dmxConnectionBlockCallback (void)

Variables

int dmxGlobalWidth
int dmxGlobalHeight
+ + + + + + + +

Functions

void dmxSetWidthHeight (int width, int height)
void dmxComputeWidthHeight (DMXRecomputeFlag flag)
void dmxConnectionBlockCallback (void)

Variables

int connBlockScreenStart
int dmxGlobalWidth
int dmxGlobalHeight
-

Detailed Description

-This code queries and modifies the connection block.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This code queries and modifies the connection block.

+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxComputeWidthHeight ( DMXRecomputeFlag  flag  ) void dmxComputeWidthHeight (DMXRecomputeFlag  flag ) 
-
- - - - - -
-   - + +
+

Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.

-

-Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.

-

- - - - -
- +

References DMX_NO_RECOMPUTE_BOUNDING_BOX, DMX_RECOMPUTE_BOUNDING_BOX, dmxGlobalHeight, dmxGlobalWidth, dmxInfo, dmxLog(), dmxNumScreens, dmxScreens, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, and _DMXScreenInfo::scrnWidth.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxConnectionBlockCallback ( void   ) void dmxConnectionBlockCallback (void  ) 
-
- - - - - -
-   - + +
+

A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.

-

-A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.

-

- - - - -
- +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, connBlockScreenStart, dmxError, dmxFatal, dmxGlobalHeight, dmxGlobalWidth, dmxInfo, dmxInputLogDevices(), dmxLog(), dmxLogVisual(), and dmxScreens.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + +
void dmxSetWidthHeight ( int  width, void dmxSetWidthHeight (int  width,
int  heightint  height 
) )
+ +
+

We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.

+ +

References dmxGlobalHeight, and dmxGlobalWidth.

+

Referenced by dmxConfigCopyData().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
int connBlockScreenStart
-
- - - - - -
-   - + +
-

-We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.

-

Variable Documentation

-

- - - - -
- +

Referenced by dmxConnectionBlockCallback().

+ + + + +
+
+
- +
int dmxGlobalHeight + int dmxGlobalHeight
-
- - - - - -
-   - + +
-

-The cursor position, in global coordinates.

-

- - - - -
- +

Referenced by dmxComputeWidthHeight(), dmxConnectionBlockCallback(), dmxConsoleComputeWidthHeight(), dmxCoreMotion(), dmxGetDesktopAttributes(), and dmxSetWidthHeight().

+ + + + +
+
+
- +
int dmxGlobalWidth + int dmxGlobalWidth
-
- - - - - -
-   - + +
+

The cursor position, in global coordinates.

-

-The cursor position, in global coordinates.

+

Referenced by dmxComputeWidthHeight(), dmxConnectionBlockCallback(), dmxConsoleComputeWidthHeight(), dmxCoreMotion(), dmxGetDesktopAttributes(), and dmxSetWidthHeight().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html deleted file mode 100644 index ff57d4982..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcb.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00039 #ifndef _DMXCB_H_
-00040 #define _DMXCB_H_
-00041 
-00042 extern int  dmxGlobalWidth, dmxGlobalHeight;
-00043 
-00046 typedef enum {
-00047     DMX_RECOMPUTE_BOUNDING_BOX,
-00048     DMX_NO_RECOMPUTE_BOUNDING_BOX
-00049 } DMXRecomputeFlag;
-00050 
-00051 extern void dmxSetWidthHeight(int width, int height);
-00052 extern void dmxComputeWidthHeight(DMXRecomputeFlag flag);
-00053 extern void dmxConnectionBlockCallback(void);
-00054 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h.html index 78eaf4f3a..cac6d4303 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcb_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxcb_8h.html @@ -6,195 +6,176 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxcb.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Enumerations

enum  DMXRecomputeFlag

Functions

void dmxSetWidthHeight (int width, int height)
void dmxComputeWidthHeight (DMXRecomputeFlag flag)
void dmxConnectionBlockCallback (void)

Variables

int dmxGlobalWidth
int dmxGlobalHeight
+ + + + + + + + +

Enumerations

enum  DMXRecomputeFlag { DMX_RECOMPUTE_BOUNDING_BOX, +DMX_NO_RECOMPUTE_BOUNDING_BOX + }

Functions

void dmxSetWidthHeight (int width, int height)
void dmxComputeWidthHeight (DMXRecomputeFlag flag)
void dmxConnectionBlockCallback (void)

Variables

int dmxGlobalWidth
int dmxGlobalHeight
-

Detailed Description

-Header file for connection block functions.
See also:
dmxcb.c.
-

Enumeration Type Documentation

-

- - - - + +
+

dmxComputeWidthHeight can either recompute the global bounding box or not.

+
Enumerator:
- +

Detailed Description

+

Header file for connection block functions.

+
See also:
dmxcb.c.
+

Enumeration Type Documentation

+ +
+
+
- +
enum DMXRecomputeFlag + enum DMXRecomputeFlag
-
+ +
DMX_RECOMPUTE_BOUNDING_BOX  +
DMX_NO_RECOMPUTE_BOUNDING_BOX  +
- - - - - -
-   - + + -

-dmxComputeWidthHeight can either recompute the global bounding box or not.

-

Function Documentation

-

- - - - -
- + + +

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxComputeWidthHeight ( DMXRecomputeFlag  flag  ) void dmxComputeWidthHeight (DMXRecomputeFlag  flag ) 
-
- - - - - -
-   - + +
+

Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.

-

-Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.

-

- - - - -
- +

References DMX_NO_RECOMPUTE_BOUNDING_BOX, DMX_RECOMPUTE_BOUNDING_BOX, dmxGlobalHeight, dmxGlobalWidth, dmxInfo, dmxLog(), dmxNumScreens, dmxScreens, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, and _DMXScreenInfo::scrnWidth.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxConnectionBlockCallback ( void   ) void dmxConnectionBlockCallback (void  ) 
-
- - - - - -
-   - + +
+

A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.

-

-A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.

-

- - - - -
- +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, connBlockScreenStart, dmxError, dmxFatal, dmxGlobalHeight, dmxGlobalWidth, dmxInfo, dmxInputLogDevices(), dmxLog(), dmxLogVisual(), and dmxScreens.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxSetWidthHeight ( int  width, void dmxSetWidthHeight (int  width,
int  heightint  height 
) )
-
- - - - - -
-   - + +
+

We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.

-

-We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.

-

Variable Documentation

-

- - - - -
- +

References dmxGlobalHeight, and dmxGlobalWidth.

+ +

Referenced by dmxConfigCopyData().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxGlobalHeight + int dmxGlobalHeight
-
- - - - - -
-   - + +
-

-The cursor position, in global coordinates.

-

- - - - -
- +

Referenced by dmxComputeWidthHeight(), dmxConnectionBlockCallback(), dmxConsoleComputeWidthHeight(), dmxCoreMotion(), dmxGetDesktopAttributes(), and dmxSetWidthHeight().

+ + + + +
+
+
- +
int dmxGlobalWidth + int dmxGlobalWidth
-
- - - - - -
-   - + +
+

The cursor position, in global coordinates.

-

-The cursor position, in global coordinates.

+

Referenced by dmxComputeWidthHeight(), dmxConnectionBlockCallback(), dmxConsoleComputeWidthHeight(), dmxCoreMotion(), dmxGetDesktopAttributes(), and dmxSetWidthHeight().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html new file mode 100644 index 000000000..37d1380d2 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html @@ -0,0 +1,83 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html deleted file mode 100644 index 39d1b3bc0..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxclient.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright (c) 1995  X Consortium
-00004  * Copyright 2004 Red Hat Inc., Durham, North Carolina.
-00005  *
-00006  * All Rights Reserved.
-00007  *
-00008  * Permission is hereby granted, free of charge, to any person obtaining
-00009  * a copy of this software and associated documentation files (the
-00010  * "Software"), to deal in the Software without restriction, including
-00011  * without limitation on the rights to use, copy, modify, merge,
-00012  * publish, distribute, sublicense, and/or sell copies of the Software,
-00013  * and to permit persons to whom the Software is furnished to do so,
-00014  * subject to the following conditions:
-00015  *
-00016  * The above copyright notice and this permission notice shall be
-00017  * included in all copies or substantial portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
-00023  * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-00024  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-00025  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-00026  * OTHER DEALINGS IN THE SOFTWARE.
-00027  *
-00028  * Except as contained in this notice, the name of the X Consortium
-00029  * shall not be used in advertising or otherwise to promote the sale,
-00030  * use or other dealings in this Software without prior written
-00031  * authorization from the X Consortium.
-00032  */
-00033 
-00034 /*
-00035  * Derived from hw/xnest/Xnest.h by Rickard E. (Rik) Faith <faith@redhat.com>
-00036  */
-00037 
-00042 #ifndef _DMXCLIENT_H_
-00043 #define _DMXCLIENT_H_
-00044 
-00045 #define GC XlibGC
-00046 
-00047 #ifdef _XSERVER64
-00048 #define DMX64
-00049 #undef _XSERVER64
-00050 typedef unsigned long XID64;
-00051 typedef unsigned long Mask64;
-00052 typedef unsigned long Atom64;
-00053 typedef unsigned long VisualID64;
-00054 typedef unsigned long Time64;
-00055 #define XID           XID64
-00056 #define Mask          Mask64
-00057 #define Atom          Atom64
-00058 #define VisualID      VisualID64
-00059 #define Time          Time64
-00060 typedef XID           Window64;
-00061 typedef XID           Drawable64;
-00062 typedef XID           Font64;
-00063 typedef XID           Pixmap64;
-00064 typedef XID           Cursor64;
-00065 typedef XID           Colormap64;
-00066 typedef XID           GContext64;
-00067 typedef XID           KeySym64;
-00068 #define Window        Window64
-00069 #define Drawable      Drawable64
-00070 #define Font          Font64
-00071 #define Pixmap        Pixmap64
-00072 #define Cursor        Cursor64
-00073 #define Colormap      Colormap64
-00074 #define GContext      GContext64
-00075 #define KeySym        KeySym64
-00076 #endif
-00077 
-00078 #include <X11/Xlib.h>
-00079 #include <X11/Xlibint.h>        /* For _XExtension */
-00080 #include <X11/X.h>              /* from glxserver.h */
-00081 #include <X11/Xmd.h>            /* from glxserver.h */
-00082 #include <X11/Xproto.h>
-00083 #include <X11/Xutil.h>
-00084 #include <X11/Xatom.h>
-00085 #include <X11/cursorfont.h>
-00086 #include <X11/Xmu/SysUtil.h>    /* For XmuSnprintf */
-00087 
-00088 #ifdef SHAPE
-00089 #include <X11/extensions/shape.h>
-00090 #endif
-00091 
-00092 #ifdef RENDER
-00093 #include <X11/extensions/Xrender.h>
-00094 #undef PictFormatType
-00095 #endif
-00096 
-00097 #ifdef XKB
-00098 #include <X11/extensions/XKB.h>
-00099 #include <X11/extensions/XKBstr.h>
-00100 #endif
-00101 
-00102 #ifdef XINPUT
-00103 #include <X11/extensions/XI.h>
-00104 #endif
-00105 
-00106 /* Always include these, since we query them even if we don't export XINPUT. */
-00107 #include <X11/extensions/XInput.h> /* For XDevice */
-00108 #include <X11/extensions/Xext.h>
-00109 
-00110 #undef GC
-00111 
-00112 #ifdef DMX64
-00113 #define _XSERVER64
-00114 #undef XID
-00115 #undef Mask
-00116 #undef Atom
-00117 #undef VisualID
-00118 #undef Time
-00119 #undef Window
-00120 #undef Drawable
-00121 #undef Font
-00122 #undef Pixmap
-00123 #undef Cursor
-00124 #undef Colormap
-00125 #undef GContext
-00126 #undef KeySym
-00127 #endif
-00128 
-00129 /* These are in exglobals.h, but that conflicts with X11/extensions/XKBsrv.h */
-00130 extern int ProximityIn;
-00131 extern int ProximityOut;
-00132 extern int DeviceValuator;
-00133 extern int DeviceMotionNotify;
-00134 extern int DeviceFocusIn;
-00135 extern int DeviceFocusOut;
-00136 extern int DeviceStateNotify;
-00137 extern int DeviceMappingNotify;
-00138 extern int ChangeDeviceNotify;
-00139 
-00140 /* Some protocol gets included last, after undefines. */
-00141 #include <X11/XKBlib.h>
-00142 #ifdef XKB
-00143 #include <X11/extensions/XKBproto.h>
-00144 #define XKB_IN_SERVER
-00145 #include <X11/extensions/XKBsrv.h>
-00146 #undef XPointer
-00147 #endif
-00148 #include <X11/extensions/XIproto.h>
-00149 
-00150 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxclient_8h.html b/xorg-server/hw/dmx/doc/html/dmxclient_8h.html index f5e62f572..cb22c41c6 100644 --- a/xorg-server/hw/dmx/doc/html/dmxclient_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxclient_8h.html @@ -6,35 +6,214 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxclient.h File Reference

#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/cursorfont.h>
-#include <X11/Xmu/SysUtil.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XInput.h>
-#include <X11/extensions/Xext.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBproto.h>
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XIproto.h>
- -

-Go to the source code of this file. - + + +
+

dmxclient.h File Reference

#include <X11/Xlib.h>
+#include <X11/Xlibint.h>
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/cursorfont.h>
+#include <X11/Xmu/SysUtil.h>
+#include <X11/extensions/shape.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/XKB.h>
+#include "xkbstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/Xext.h>
+#include <X11/XKBlib.h>
+#include <X11/extensions/XKBproto.h>
+#include <X11/extensions/XIproto.h>
+ +

Go to the source code of this file.

+
+ + + + + + + + + + + +

Defines

#define GC   XlibGC

Variables

int ProximityIn
int ProximityOut
int DeviceValuator
int DeviceMotionNotify
int DeviceFocusIn
int DeviceFocusOut
int DeviceStateNotify
int DeviceMappingNotify
int ChangeDeviceNotify
-

Detailed Description

-This file includes all client-side include files with proper wrapping.
+

Detailed Description

+

This file includes all client-side include files with proper wrapping.

+

Define Documentation

+ +
+
+ + + + +
#define GC   XlibGC
+
+
+ +

Referenced by dmxConfigCanvasUpdate().

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
int ChangeDeviceNotify
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int DeviceFocusIn
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int DeviceFocusOut
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int DeviceMappingNotify
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int DeviceMotionNotify
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxExtMotion().

+ +
+
+ +
+
+ + + + +
int DeviceStateNotify
+
+
+ +

Referenced by dmxCommonOthOn(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int DeviceValuator
+
+
+ +

Referenced by dmxExtMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int ProximityIn
+
+
+ +

Referenced by dmxCommonOthOn(), dmxEnqueue(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int ProximityOut
+
+
+ +

Referenced by dmxCommonOthOn(), dmxEnqueue(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
Generated June 29, 2004 for + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html index 40f62a633..adbef732d 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html @@ -6,251 +6,240 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcmap.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxcmap.h"
-#include "dmxvisual.h"
-#include "micmap.h"
- - - - - - + + +
+

dmxcmap.c File Reference

#include "dmx.h"
+#include "dmxlog.h"
+#include "dmxsync.h"
+#include "dmxcmap.h"
+#include "dmxvisual.h"
+#include "micmap.h"
+

Functions

Bool dmxBECreateColormap (ColormapPtr pColormap)
Bool dmxCreateColormap (ColormapPtr pColormap)
+ + + + + + + + + +

Functions

static Bool dmxAllocateColormapPrivates (ColormapPtr pColormap)
Bool dmxBECreateColormap (ColormapPtr pColormap)
Bool dmxCreateColormap (ColormapPtr pColormap)
Bool dmxBEFreeColormap (ColormapPtr pColormap)
void dmxDestroyColormap (ColormapPtr pColormap)
void dmxInstallColormap (ColormapPtr pColormap)
void dmxStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef)
Bool dmxCreateDefColormap (ScreenPtr pScreen)
+

Detailed Description

+

Colormap support.

+

Function Documentation

+ +
+
+ + + + + + + + + +
static Bool dmxAllocateColormapPrivates (ColormapPtr  pColormap )  [static]
+
+
-Bool dmxBEFreeColormap (ColormapPtr pColormap) +

References _dmxColormapPriv::cmap, and DMX_SET_COLORMAP_PRIV.

-void dmxDestroyColormap (ColormapPtr pColormap) +

Referenced by dmxCreateColormap().

-void dmxInstallColormap (ColormapPtr pColormap) +
+
+ +
+
+ + + + + + + + + +
Bool dmxBECreateColormap (ColormapPtr  pColormap ) 
+
+
+

Create pColormap on the back-end server.

-void dmxStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef) +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, dmxLog(), dmxLookupVisual(), dmxScreens, dmxWarning, and _DMXScreenInfo::scrnWin.

-Bool dmxCreateDefColormap (ScreenPtr pScreen) +

Referenced by dmxBECreateResources(), and dmxCreateColormap().

- -

Detailed Description

-Colormap support.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
Bool dmxBECreateColormap ( ColormapPtr  pColormap  ) Bool dmxBEFreeColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Destroy pColormap on the back-end server.

-

-Create pColormap on the back-end server.

-

- - - - -
- - - - - - - - - +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, and dmxScreens.

-
Bool dmxBEFreeColormap ( ColormapPtr  pColormap  ) 
-
- - - - - -
-   - +

Referenced by dmxBEDestroyResources(), and dmxDestroyColormap().

-

-Destroy pColormap on the back-end server.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateColormap ( ColormapPtr  pColormap  ) Bool dmxCreateColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Create colormap on back-end server associated with pColormap's screen.

-

-Create colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_UNWRAP, DMX_WRAP, dmxAllocateColormapPrivates(), dmxBECreateColormap(), dmxCreateColormap(), and dmxScreens.

+ +

Referenced by dmxCreateColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateDefColormap ( ScreenPtr  pScreen  ) Bool dmxCreateDefColormap (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Create the DMX server's default colormap.

-

- - - - -
- + +
+

Create the DMX server's default colormap.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyColormap ( ColormapPtr  pColormap  ) void dmxDestroyColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Destroy colormap on back-end server associated with pColormap's screen.

-

-Destroy colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_COLORMAP_PRIV, DMX_SET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEFreeColormap(), dmxDestroyColormap(), and dmxScreens.

+ +

Referenced by dmxDestroyColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxInstallColormap ( ColormapPtr  pColormap  ) void dmxInstallColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Install colormap on back-end server associated with pColormap's screen.

-

-Install colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxInstallColormap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxInstallColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxStoreColors ( ColormapPtr  pColormap, void dmxStoreColors (ColormapPtr  pColormap,
int  ndef, int  ndef,
xColorItem *  pdefxColorItem *  pdef 
) )
-
- - - - - -
-   - + +
+

Store colors in pColormap on back-end server associated with pColormap's screen.

-

-Store colors in pColormap on back-end server associated with pColormap's screen.

+

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxStoreColors(), and dmxSync().

+ +

Referenced by dmxScreenInit(), and dmxStoreColors().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html deleted file mode 100644 index b3a9b291a..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcmap.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXCMAP_H
-00039 #define DMXCMAP_H
-00040 
-00041 #include "colormapst.h"
-00042 
-00044 typedef struct _dmxColormapPriv {
-00045     Colormap  cmap;
-00046 } dmxColormapPrivRec, *dmxColormapPrivPtr;
-00047 
-00048 
-00049 extern Bool dmxCreateColormap(ColormapPtr pColormap);
-00050 extern void dmxDestroyColormap(ColormapPtr pColormap);
-00051 extern void dmxInstallColormap(ColormapPtr pColormap);
-00052 extern void dmxStoreColors(ColormapPtr pColormap, int ndef, xColorItem *pdef);
-00053 
-00054 extern Bool dmxCreateDefColormap(ScreenPtr pScreen);
-00055 
-00056 extern Bool dmxBECreateColormap(ColormapPtr pColormap);
-00057 extern Bool dmxBEFreeColormap(ColormapPtr pColormap);
-00058 
-00060 extern int dmxColormapPrivateIndex;
-00061 
-00063 #define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)                       \
-00064     (_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr                  \
-00065         = (pointer)(_pCMapPriv);
-00066 
-00068 #define DMX_GET_COLORMAP_PRIV(_pCMap)                                   \
-00069     (dmxColormapPrivPtr)(_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr
-00070 
-00071 #endif /* DMXCMAP_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html index f22a97b0e..d07836d7a 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html @@ -6,394 +6,324 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcmap.h File Reference

#include "colormapst.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxcmap.h File Reference

#include "colormapst.h"
+ +

Go to the source code of this file.

+

Data Structures

struct  _dmxColormapPriv

Defines

#define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)
#define DMX_GET_COLORMAP_PRIV(_pCMap)   (dmxColormapPrivPtr)(_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr

Typedefs

typedef _dmxColormapPriv dmxColormapPrivRec
typedef _dmxColormapPriv * dmxColormapPrivPtr

Functions

Bool dmxCreateColormap (ColormapPtr pColormap)
void dmxDestroyColormap (ColormapPtr pColormap)
void dmxInstallColormap (ColormapPtr pColormap)
void dmxStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef)
Bool dmxCreateDefColormap (ScreenPtr pScreen)
Bool dmxBECreateColormap (ColormapPtr pColormap)
Bool dmxBEFreeColormap (ColormapPtr pColormap)

Variables

int dmxColormapPrivateIndex
+ + + + + + + + + + + + + + + + + +

Data Structures

struct  _dmxColormapPriv

Defines

#define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)   dixSetPrivate(&(_pCMap)->devPrivates, dmxColormapPrivateKey, _pCMapPriv)
#define DMX_GET_COLORMAP_PRIV(_pCMap)

Typedefs

typedef struct _dmxColormapPriv dmxColormapPrivRec
typedef struct _dmxColormapPriv * dmxColormapPrivPtr

Functions

Bool dmxCreateColormap (ColormapPtr pColormap)
void dmxDestroyColormap (ColormapPtr pColormap)
void dmxInstallColormap (ColormapPtr pColormap)
void dmxStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef)
Bool dmxCreateDefColormap (ScreenPtr pScreen)
Bool dmxBECreateColormap (ColormapPtr pColormap)
Bool dmxBEFreeColormap (ColormapPtr pColormap)

Variables

DevPrivateKey dmxColormapPrivateKey
-

Detailed Description

-Header file for colormap support.
See also:
dmxcmap.c.
-

Define Documentation

-

- - - - -
- +

Detailed Description

+

Header file for colormap support.

+
See also:
dmxcmap.c.
+

Define Documentation

+ +
+
+
- - - - - - + + + + + +
#define DMX_GET_COLORMAP_PRIV( _pCMap   )    (dmxColormapPrivPtr)(_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr + #define DMX_GET_COLORMAP_PRIV(_pCMap  ) 
-
- - - - - -
-   - - -

-Get colormap private structure.

-

- - - - -
- + +
+Value:
(dmxColormapPrivPtr)            \
+    dixLookupPrivate(&(_pCMap)->devPrivates, dmxColormapPrivateKey)
+

Get colormap private structure.

+ +

Referenced by dmxBECreateColormap(), dmxBEFreeColormap(), dmxCreateRootWindow(), dmxDestroyColormap(), dmxDoChangeWindowAttributes(), dmxGetDefaultWindowAttributes(), dmxInstallColormap(), and dmxStoreColors().

+ +
+ + +
+
+
- - - - + + + + + + - - - - + + + +
#define DMX_SET_COLORMAP_PRIV( _pCMap,
#define DMX_SET_COLORMAP_PRIV(_pCMap,
_pCMapPriv   )  + _pCMapPriv  )    dixSetPrivate(&(_pCMap)->devPrivates, dmxColormapPrivateKey, _pCMapPriv)
-
- - - - - -
-   - - -

-Value:

(_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr                      \
-        = (pointer)(_pCMapPriv);
-
Set colormap private structure.
-

Typedef Documentation

-

- - - - -
- + +
+

Set colormap private structure.

+ +

Referenced by dmxAllocateColormapPrivates(), and dmxDestroyColormap().

+ +
+ +

Typedef Documentation

+ +
+
+
- +
typedef struct _dmxColormapPriv * dmxColormapPrivPtr + typedef struct _dmxColormapPriv * dmxColormapPrivPtr
-
- - - - - -
-   - - -

-Colormap private area.

-

- - - - -
- + +
+ +
+ + +
+
+
- +
typedef struct _dmxColormapPriv dmxColormapPrivRec + typedef struct _dmxColormapPriv dmxColormapPrivRec
-
- - - - - -
-   - - -

-Colormap private area.

-

Function Documentation

-

- - - - -
- + +
+

Colormap private area.

+ +
+ +

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
Bool dmxBECreateColormap ( ColormapPtr  pColormap  ) Bool dmxBECreateColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Create pColormap on the back-end server.

-

-Create pColormap on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, dmxLog(), dmxLookupVisual(), dmxScreens, dmxWarning, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBECreateResources(), and dmxCreateColormap().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreeColormap ( ColormapPtr  pColormap  ) Bool dmxBEFreeColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Destroy pColormap on the back-end server.

-

-Destroy pColormap on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, and dmxScreens.

+ +

Referenced by dmxBEDestroyResources(), and dmxDestroyColormap().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateColormap ( ColormapPtr  pColormap  ) Bool dmxCreateColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Create colormap on back-end server associated with pColormap's screen.

-

-Create colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_UNWRAP, DMX_WRAP, dmxAllocateColormapPrivates(), dmxBECreateColormap(), dmxCreateColormap(), and dmxScreens.

+ +

Referenced by dmxCreateColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateDefColormap ( ScreenPtr  pScreen  ) Bool dmxCreateDefColormap (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Create the DMX server's default colormap.

-

- - - - -
- + +
+

Create the DMX server's default colormap.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyColormap ( ColormapPtr  pColormap  ) void dmxDestroyColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Destroy colormap on back-end server associated with pColormap's screen.

-

-Destroy colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_COLORMAP_PRIV, DMX_SET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEFreeColormap(), dmxDestroyColormap(), and dmxScreens.

+ +

Referenced by dmxDestroyColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxInstallColormap ( ColormapPtr  pColormap  ) void dmxInstallColormap (ColormapPtr  pColormap ) 
-
- - - - - -
-   - + +
+

Install colormap on back-end server associated with pColormap's screen.

-

-Install colormap on back-end server associated with pColormap's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxInstallColormap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxInstallColormap(), and dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxStoreColors ( ColormapPtr  pColormap, void dmxStoreColors (ColormapPtr  pColormap,
int  ndef, int  ndef,
xColorItem *  pdefxColorItem *  pdef 
) )
-
- - - - - -
-   - + +
+

Store colors in pColormap on back-end server associated with pColormap's screen.

-

-Store colors in pColormap on back-end server associated with pColormap's screen.

-

Variable Documentation

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxStoreColors(), and dmxSync().

+ +

Referenced by dmxScreenInit(), and dmxStoreColors().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxColormapPrivateIndex + DevPrivateKey dmxColormapPrivateKey
-
- - - - - -
-   - - -

-Private index for Colormaps

+ +

+

Private index.

+
See also:
dmxcmap.c
+
+dmxscrinit.c
+
+dmxwindow.c
+

Private index for Colormaps

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html new file mode 100644 index 000000000..e9e0ed041 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html @@ -0,0 +1,98 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html index 3e0459c12..6782e36ff 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html @@ -6,687 +6,875 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcommon.c File Reference

#include "dmxinputinit.h"
-#include "dmxcommon.h"
-#include "dmxconsole.h"
-#include "dmxprop.h"
-#include "dmxsync.h"
-#include "dmxmap.h"
-#include "inputstr.h"
-#include "input.h"
-#include "keysym.h"
-#include "mipointer.h"
-#include "scrnintstr.h"
-#include <unistd.h>
- - - - + + +
+

dmxcommon.c File Reference

#include "dmxinputinit.h"
+#include "dmxcommon.h"
+#include "dmxconsole.h"
+#include "dmxprop.h"
+#include "dmxsync.h"
+#include "dmxmap.h"
+#include "inputstr.h"
+#include "input.h"
+#include <X11/keysym.h>
+#include "mipointer.h"
+#include "scrnintstr.h"
+#include <unistd.h>
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define DMX_STATE_DEBUG   0
#define DMXDBG0(f)
#define NAME(x)   priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL
#define ADD(type)

Typedefs

typedef struct _myPrivate myPrivate

Functions

static void dmxCommonKbdSetAR (Display *display, unsigned char *old, unsigned char *new)
static void dmxCommonKbdSetLeds (Display *display, unsigned long new)
static void dmxCommonKbdSetCtrl (Display *display, KeybdCtrl *old, KeybdCtrl *new)
static void dmxCommonMouSetCtrl (Display *display, PtrCtrl *old, PtrCtrl *new)
void dmxCommonKbdCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void dmxCommonMouCtrl (DevicePtr pDev, PtrCtrl *ctrl)
void dmxCommonKbdBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
void dmxCommonKbdGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
void dmxCommonKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int dmxCommonKbdOn (DevicePtr pDev)
void dmxCommonKbdOff (DevicePtr pDev)
int dmxCommonOthOn (DevicePtr pDev)
void dmxCommonOthOff (DevicePtr pDev)
void dmxCommonOthGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxCommonMouGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
static void * dmxCommonXSelect (DMXScreenInfo *dmxScreen, void *closure)
static void * dmxCommonAddEnabledDevice (DMXScreenInfo *dmxScreen, void *closure)
static void * dmxCommonRemoveEnabledDevice (DMXScreenInfo *dmxScreen, void *closure)
int dmxCommonMouOn (DevicePtr pDev)
void dmxCommonMouOff (DevicePtr pDev)
int dmxFindPointerScreen (int x, int y)
pointer dmxCommonCopyPrivate (DeviceIntPtr pDevice)
void dmxCommonSaveState (pointer private)
void dmxCommonRestoreState (pointer private)
+

Detailed Description

+

This file implements common routines used by the backend and console input devices.

+

Define Documentation

+ +
+
+ + + + + + + + + +
#define ADD(type  ) 
+
+
+Value:
if (count < DMX_MAX_XINPUT_EVENT_TYPES) {                                \
+        type(priv->xi, event_type[count], event_list[count]);                \
+        if (event_type[count]) {                                             \
+            dmxMapInsert(dmxLocal, event_type[count], XI_##type);            \
+            ++count;                                                         \
+        }                                                                    \
+    } else {                                                                 \
+        dmxLog(dmxWarning, "More than %d event types for %s\n",              \
+               DMX_MAX_XINPUT_EVENT_TYPES, dmxInput->name);                  \
+    }
+
+

Referenced by dmxCommonOthOn().

+ +
+
+ +
+
+ + + + +
#define DMX_STATE_DEBUG   0
+
+
-

Typedefs

-typedef _myPrivate myPrivate +
+
+ +
+
+ + + + + + + + + +
#define DMXDBG0(f  ) 
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define NAME(x  )    priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL
+
+
-

Functions

-void dmxCommonKbdCtrl (DevicePtr pDev, KeybdCtrl *ctrl) +

Referenced by dmxCommonKbdGetInfo().

-void dmxCommonMouCtrl (DevicePtr pDev, PtrCtrl *ctrl) +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _myPrivate myPrivate
+
+
+

Each device has a private area that is visible only from inside the driver code.

-void dmxCommonKbdBell (DevicePtr pDev, int percent, int volume, int pitch, int duration) +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
static void* dmxCommonAddEnabledDevice (DMXScreenInfo *  dmxScreen,
void *  closure 
) [static]
+
+
-void dmxCommonKbdGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap) +

References _DMXScreenInfo::beDisplay.

-void dmxCommonKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +

Referenced by dmxCommonMouOn().

-int dmxCommonKbdOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + +
pointer dmxCommonCopyPrivate (DeviceIntPtr  pDevice ) 
+
+
+

Returns a pointer to the private area for the device that comes just prior to pDevice in the current dmxInput device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.

-void dmxCommonKbdOff (DevicePtr pDev) +

References _DMXInputInfo::devs, dmxInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::private.

-int dmxCommonOthOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxCommonKbdBell (DevicePtr  pDev,
int  percent,
int  volume,
int  pitch,
int  duration 
)
+
+
+

Sound they keyboard bell.

-void dmxCommonOthOff (DevicePtr pDev) +

References GETPRIVFROMPDEV.

-void dmxCommonOthGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxCommonKbdCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrl 
)
+
+
+

Update the keyboard control.

-void dmxCommonMouGetMap (DevicePtr pDev, unsigned char *map, int *nButtons) +

References dmxCommonKbdSetCtrl(), dmxCommonSaveState(), and GETPRIVFROMPDEV.

-int dmxCommonMouOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxCommonKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
+
+
+

Fill in the XKEYBOARD parts of the info structure for the specified pDev.

-void dmxCommonMouOff (DevicePtr pDev) +

References dmxCommonRestoreState(), dmxCommonSaveState(), dmxLogInput(), _DMXLocalInitInfo::freenames, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, NAME, and _DMXLocalInitInfo::names.

-int dmxFindPointerScreen (int x, int y) +

Referenced by dmxBackendKbdGetInfo(), and dmxConsoleKbdGetInfo().

-pointer dmxCommonCopyPrivate (DeviceIntPtr pDevice) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void dmxCommonKbdGetMap (DevicePtr  pDev,
KeySymsPtr  pKeySyms,
CARD8 *  pModMap 
)
+
+
+

Get the keyboard mapping.

-void dmxCommonSaveState (pointer private) +

References GETPRIVFROMPDEV.

-void dmxCommonRestoreState (pointer private) +

Referenced by dmxBackendKbdGetInfo(), and dmxConsoleKbdGetInfo().

- -

Detailed Description

-This file implements common routines used by the backend and console input devices.

Typedef Documentation

-

- - - - -
- - -
typedef struct _myPrivate myPrivate -
-
- - - - - -
-   - - -

-Each device has a private area that is visible only from inside the driver code.

-

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
pointer dmxCommonCopyPrivate ( DeviceIntPtr  pDevice  ) void dmxCommonKbdOff (DevicePtr  pDev ) 
+ +
+

Turn pDev off.

+ +

References DMX_KEYBOARD_EVENT_MASK, dmxCommonRestoreState(), and GETPRIVFROMPDEV.

+
+ + +
+
+ + + + + + + + +
int dmxCommonKbdOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Returns a pointer to the private area for the device that comes just prior to pDevice in the current dmxInput device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References DMX_KEYBOARD_EVENT_MASK, dmxCommonSaveState(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - - + + + +
void dmxCommonKbdBell ( DevicePtr  pDev, static void dmxCommonKbdSetAR (Display *  display,
int  percent, unsigned char *  old,
int  volume, unsigned char *  new 
int  pitch, ) [static]
+ +
+ +

Referenced by dmxCommonKbdSetCtrl().

+ +
+ + +
+
+ + + + + + + + + + + + - - + + - - + + -
static void dmxCommonKbdSetCtrl (Display *  display,
KeybdCtrl *  old,
int  durationKeybdCtrl *  new 
) ) [static]
-
- - - - - -
-   - - -

-Sound they keyboard bell.

-

- - - - -
- + +
+ +

References dmxCommonKbdSetAR(), and dmxCommonKbdSetLeds().

+ +

Referenced by dmxCommonKbdCtrl(), dmxCommonRestoreState(), and dmxCommonSaveState().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonKbdCtrl ( DevicePtr  pDev, static void dmxCommonKbdSetLeds (Display *  display,
KeybdCtrl *  ctrlunsigned long  new 
) ) [static]
-
- - - - - -
-   - - -

-Update the keyboard control.

-

- - - - -
- + +
+ +

Referenced by dmxCommonKbdSetCtrl().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonKbdGetInfo ( DevicePtr  pDev, void dmxCommonMouCtrl (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoPtrCtrl *  ctrl 
) )
-
- - - - - -
-   - - -

-Fill in the XKEYBOARD parts of the info structure for the specified pDev.

-

- - - - -
- + +
+

Update the mouse control.

+ +

References dmxCommonMouSetCtrl(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCommonKbdGetMap ( DevicePtr  pDev, void dmxCommonMouGetMap (DevicePtr  pDev,
KeySymsPtr  pKeySyms, unsigned char *  map,
CARD8 *  pModMapint *  nButtons 
) )
-
- - - - - -
-   - - -

-Get the keyboard mapping.

-

- - - - -
- + +
+

Obtain the mouse button mapping.

+ +

References DMX_MAX_BUTTONS, and GETPRIVFROMPDEV.

+ +

Referenced by dmxBackendMouGetInfo(), and dmxConsoleMouGetInfo().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonKbdOff ( DevicePtr  pDev  ) void dmxCommonMouOff (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- + +
+

Turn pDev off.

+ +

References DMX_POINTER_EVENT_MASK, dmxCommonRemoveEnabledDevice(), dmxCommonXSelect(), dmxPropertyIterate(), GETDMXINPUTFROMPRIV, and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCommonKbdOn ( DevicePtr  pDev  ) int dmxCommonMouOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References DMX_POINTER_EVENT_MASK, dmxCommonAddEnabledDevice(), dmxCommonXSelect(), dmxPropertyIterate(), dmxScreens, dmxShadowFB, dmxSync(), GETDMXINPUTFROMPRIV, and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + - - + + -
void dmxCommonMouCtrl ( DevicePtr  pDev, static void dmxCommonMouSetCtrl (Display *  display,
PtrCtrl *  old,
PtrCtrl *  ctrlPtrCtrl *  new 
) ) [static]
-
- - - - - -
-   - - -

-Update the mouse control.

-

- - - - -
- + +
+ +

Referenced by dmxCommonMouCtrl().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - - + + +
void dmxCommonMouGetMap ( DevicePtr  pDev, void dmxCommonOthGetInfo (DevicePtr  pDev,
unsigned char *  map, DMXLocalInitInfoPtr  info 
int *  nButtons)
+ +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::buttonClass, display, dmxInputExtensionErrorHandler(), _DMXLocalInitInfo::focusClass, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numAbsAxes, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::proximityClass, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + - - -
void dmxCommonOthOff (DevicePtr  pDev )  ) 
-
- - - - - -
-   - - -

-Obtain the mouse button mapping.

-

- - - - -
- - - - - - - - - + +
+

Turn pDev off.

-
void dmxCommonMouOff ( DevicePtr  pDev  ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- +

References GETPRIVFROMPDEV.

+ + + + +
+
+
- - - - - - + + + + + + -
int dmxCommonMouOn ( DevicePtr  pDev  ) int dmxCommonOthOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References ADD, ChangeDeviceNotify, DeviceFocusIn, DeviceFocusOut, DeviceMappingNotify, DeviceMotionNotify, DeviceStateNotify, DMX_MAX_XINPUT_EVENT_TYPES, dmxLog(), dmxWarning, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, ProximityIn, and ProximityOut.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonOthGetInfo ( DevicePtr  pDev, static void* dmxCommonRemoveEnabledDevice (DMXScreenInfo *  dmxScreen,
DMXLocalInitInfoPtr  infovoid *  closure 
) ) [static]
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay.

+ +

Referenced by dmxCommonMouOff().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonOthOff ( DevicePtr  pDev  ) void dmxCommonRestoreState (pointer  private ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- + +
+

This routine restores all the information saved by dmxCommonSaveState.

+ +

References dmxCommonKbdSetCtrl(), DMXDBG0, dmxLog(), dmxLogInput(), dmxWarning, and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendCollectEvents(), dmxCloseConsole(), dmxCommonKbdGetInfo(), dmxCommonKbdOff(), and dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCommonOthOn ( DevicePtr  pDev  ) void dmxCommonSaveState (pointer  private ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

This routine saves and resets some important state for the backend and console device drivers:

+
    +
  • the modifier map is saved and set to 0 (so DMX controls the LEDs)
    • +
  • the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using
    • +
+

This routine and dmxCommonRestoreState are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).

+ +

References dmxCommonKbdSetCtrl(), DMXDBG0, dmxLogInput(), dmxScreens, dmxSync(), dmxUseXKB, and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendCollectEvents(), dmxCommonKbdCtrl(), dmxCommonKbdGetInfo(), dmxCommonKbdOn(), and dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - - - + + + + - -
void dmxCommonRestoreState ( pointer  private  ) static void* dmxCommonXSelect (DMXScreenInfo *  dmxScreen,
-
- - - - - -
-   - - -

-This routine restores all the information saved by dmxCommonSaveState.

-

- - - - -
- - - - - - - + + + + + + + + + -
void dmxCommonSaveState ( pointer  private  ) void *  closure 
) [static]
-
- - - - - -
-   - - -

-This routine saves and resets some important state for the backend and console device drivers:

    -
  • the modifier map is saved and set to 0 (so DMX controls the LEDs)
  • the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using
-

-This routine and dmxCommonRestoreState are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxCommonMouOff(), and dmxCommonMouOn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxFindPointerScreen ( int  x, int dmxFindPointerScreen (int  x,
int  yint  y 
) )
-
- - - - - -
-   - - -

-Given the global coordinates x and y, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into #dmxScreenInfo and is between -1 and dmxNumScreens - 1, inclusive.

+

+
+

Given the global coordinates x and y, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into dmxScreenInfo and is between -1 and dmxNumScreens - 1, inclusive.

+ +

References dmxNumScreens.

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html deleted file mode 100644 index 72ac5378b..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcommon.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00039 #ifndef _DMXCOMMON_H_
-00040 #define _DMXCOMMON_H_
-00041 
-00042 #define DMX_COMMON_OTHER                    \
-00043     Display                 *display;       \
-00044     Window                  window;         \
-00045     DMXScreenInfo           *be;            \
-00046     DMXLocalInputInfoPtr    dmxLocal;       \
-00047     int                     initPointerX;   \
-00048     int                     initPointerY;   \
-00049     long                    eventMask;      \
-00050     KeybdCtrl               kctrl;          \
-00051     PtrCtrl                 mctrl;          \
-00052     int                     kctrlset;       \
-00053     int                     mctrlset;       \
-00054     KeybdCtrl               savedKctrl;     \
-00055     XModifierKeymap         *savedModMap;   \
-00056     int                     stateSaved
-00057 
-00058 #ifdef XKB
-00059 #define DMX_COMMON_XKB                      \
-00060     DMX_COMMON_OTHER;                       \
-00061     XkbDescPtr              xkb;            \
-00062     XkbIndicatorRec         savedIndicators
-00063 #else
-00064 #define DMX_COMMON_XKB      DMX_COMMON_OTHER
-00065 #endif
-00066 
-00067 #ifdef XINPUT
-00068 #define DMX_COMMON_PRIVATE                  \
-00069     DMX_COMMON_XKB;                         \
-00070     XDevice                 *xi
-00071 #else
-00072 #define DMX_COMMON_PRIVATE  DMX_COMMON_OTHER
-00073 #endif
-00074 
-00075 #define GETONLYPRIVFROMPRIVATE                                          \
-00076     myPrivate            *priv     = private
-00077 
-00078 #define GETPRIVFROMPRIVATE                                              \
-00079     GETONLYPRIVFROMPRIVATE;                                             \
-00080     DMXInputInfo         *dmxInput = &dmxInputs[priv->dmxLocal->inputIdx]
-00081 
-00082 #define GETDMXLOCALFROMPDEVICE                                          \
-00083     DevicePtr            pDev      = &pDevice->public;                  \
-00084     DMXLocalInputInfoPtr dmxLocal  = pDev->devicePrivate
-00085 
-00086 #define GETDMXINPUTFROMPRIV                                             \
-00087     DMXInputInfo         *dmxInput = &dmxInputs[priv->dmxLocal->inputIdx]
-00088 
-00089 #define GETDMXINPUTFROMPDEVICE                                          \
-00090     GETDMXLOCALFROMPDEVICE;                                             \
-00091     DMXInputInfo         *dmxInput = &dmxInputs[dmxLocal->inputIdx]
-00092 
-00093 #define GETDMXLOCALFROMPDEV                                             \
-00094     DMXLocalInputInfoPtr dmxLocal  = pDev->devicePrivate
-00095 
-00096 #define GETDMXINPUTFROMPDEV                                             \
-00097     GETDMXLOCALFROMPDEV;                                                \
-00098     DMXInputInfo         *dmxInput = &dmxInputs[dmxLocal->inputIdx]
-00099 
-00100 #define GETPRIVFROMPDEV                                                 \
-00101     GETDMXLOCALFROMPDEV;                                                \
-00102     myPrivate            *priv     = dmxLocal->private
-00103 
-00104 #define DMX_KEYBOARD_EVENT_MASK                                         \
-00105     (KeyPressMask | KeyReleaseMask | KeymapStateMask)
-00106 
-00107 #define DMX_POINTER_EVENT_MASK                                          \
-00108     (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
-00109 
-00110 extern void    dmxCommonKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00111 extern void    dmxCommonKbdGetMap(DevicePtr pDev,
-00112                                   KeySymsPtr pKeySyms, CARD8 *pModMap);
-00113 extern void    dmxCommonKbdCtrl(DevicePtr pDev, KeybdCtrl *ctrl);
-00114 extern void    dmxCommonKbdBell(DevicePtr pDev, int percent,
-00115                                 int volume, int pitch, int duration);
-00116 extern int     dmxCommonKbdOn(DevicePtr pDev);
-00117 extern void    dmxCommonKbdOff(DevicePtr pDev);
-00118 extern void    dmxCommonMouGetMap(DevicePtr pDev,
-00119                                   unsigned char *map, int *nButtons);
-00120 extern void    dmxCommonMouCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00121 extern int     dmxCommonMouOn(DevicePtr pDev);
-00122 extern void    dmxCommonMouOff(DevicePtr pDev);
-00123 extern int     dmxFindPointerScreen(int x, int y);
-00124 
-00125 extern int     dmxCommonOthOn(DevicePtr pDev);
-00126 extern void    dmxCommonOthOff(DevicePtr pDev);
-00127 extern void    dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00128 
-00129                                 /* helper functions */
-00130 extern pointer dmxCommonCopyPrivate(DeviceIntPtr pDevice);
-00131 extern void    dmxCommonSaveState(pointer private);
-00132 extern void    dmxCommonRestoreState(pointer private);
-00133 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html index 9367b5d2c..469d991a7 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html @@ -6,651 +6,761 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxcommon.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxCommonKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxCommonKbdGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
void dmxCommonKbdCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void dmxCommonKbdBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
int dmxCommonKbdOn (DevicePtr pDev)
void dmxCommonKbdOff (DevicePtr pDev)
void dmxCommonMouGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
void dmxCommonMouCtrl (DevicePtr pDev, PtrCtrl *ctrl)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_COMMON_OTHER
#define DMX_COMMON_XKB
#define DMX_COMMON_PRIVATE
#define GETONLYPRIVFROMPRIVATE   myPrivate *priv = private
#define GETPRIVFROMPRIVATE
#define GETDMXLOCALFROMPDEVICE
#define GETDMXINPUTFROMPRIV   DMXInputInfo *dmxInput = &dmxInputs[priv->dmxLocal->inputIdx]
#define GETDMXINPUTFROMPDEVICE
#define GETDMXLOCALFROMPDEV   DMXLocalInputInfoPtr dmxLocal = pDev->devicePrivate
#define GETDMXINPUTFROMPDEV
#define GETPRIVFROMPDEV
#define DMX_KEYBOARD_EVENT_MASK   (KeyPressMask | KeyReleaseMask | KeymapStateMask)
#define DMX_POINTER_EVENT_MASK   (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)

Functions

void dmxCommonKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxCommonKbdGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
void dmxCommonKbdCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void dmxCommonKbdBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
int dmxCommonKbdOn (DevicePtr pDev)
void dmxCommonKbdOff (DevicePtr pDev)
void dmxCommonMouGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
void dmxCommonMouCtrl (DevicePtr pDev, PtrCtrl *ctrl)
int dmxCommonMouOn (DevicePtr pDev)
void dmxCommonMouOff (DevicePtr pDev)
int dmxFindPointerScreen (int x, int y)
int dmxCommonOthOn (DevicePtr pDev)
void dmxCommonOthOff (DevicePtr pDev)
void dmxCommonOthGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
pointer dmxCommonCopyPrivate (DeviceIntPtr pDevice)
void dmxCommonSaveState (pointer private)
void dmxCommonRestoreState (pointer private)
+

Detailed Description

+

Interface to functions used by backend and console input devices.

+
See also:
dmxcommon.c
+
+dmxbackend.c
+
+dmxconsole.c
+

Define Documentation

+ +
+
+ + + + +
#define DMX_COMMON_OTHER
+
+
+Value:
Display                 *display;       \
+    Window                  window;         \
+    DMXScreenInfo           *be;            \
+    DMXLocalInputInfoPtr    dmxLocal;       \
+    int                     initPointerX;   \
+    int                     initPointerY;   \
+    long                    eventMask;      \
+    KeybdCtrl               kctrl;          \
+    PtrCtrl                 mctrl;          \
+    int                     kctrlset;       \
+    int                     mctrlset;       \
+    KeybdCtrl               savedKctrl;     \
+    XModifierKeymap         *savedModMap;   \
+    int                     stateSaved
+
+
+
+ +
+
+ + + + +
#define DMX_COMMON_PRIVATE
+
+
+Value:
DMX_COMMON_XKB;                         \
+    XDevice                 *xi
+
+
+
+ +
+
+ + + + +
#define DMX_COMMON_XKB
+
+
+Value:
DMX_COMMON_OTHER;                       \
+    XkbDescPtr              xkb;            \
+    XkbIndicatorRec         savedIndicators
+
+
+
+ +
+
+ + + + +
#define DMX_KEYBOARD_EVENT_MASK   (KeyPressMask | KeyReleaseMask | KeymapStateMask)
+
+
-int dmxCommonMouOn (DevicePtr pDev) +

Referenced by dmxCommonKbdOff(), and dmxCommonKbdOn().

-void dmxCommonMouOff (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define DMX_POINTER_EVENT_MASK   (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
+
+
-int dmxFindPointerScreen (int x, int y) +

Referenced by dmxCommonMouOff(), and dmxCommonMouOn().

-int dmxCommonOthOn (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define GETDMXINPUTFROMPDEV
+
+
+Value:
GETDMXLOCALFROMPDEV;                                                \
+    DMXInputInfo         *dmxInput = &dmxInputs[dmxLocal->inputIdx]
+
+

Referenced by dmxCheckSpecialKeys(), and dmxEnqueue().

+ +
+
+ +
+
+ + + + +
#define GETDMXINPUTFROMPDEVICE
+
+
+Value:
GETDMXLOCALFROMPDEVICE;                                             \
+    DMXInputInfo         *dmxInput = &dmxInputs[dmxLocal->inputIdx]
+
+

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

+ +
+
+ +
+
+ + + + +
#define GETDMXINPUTFROMPRIV   DMXInputInfo *dmxInput = &dmxInputs[priv->dmxLocal->inputIdx]
+
+
-void dmxCommonOthOff (DevicePtr pDev) +

Referenced by dmxBackendCollectEvents(), dmxCloseConsole(), dmxCommonKbdGetInfo(), dmxCommonMouOff(), dmxCommonMouOn(), dmxCommonOthGetInfo(), dmxCommonOthOn(), dmxConsoleCollectEvents(), and dmxConsoleDraw().

-void dmxCommonOthGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + +
#define GETDMXLOCALFROMPDEV   DMXLocalInputInfoPtr dmxLocal = pDev->devicePrivate
+
+
-pointer dmxCommonCopyPrivate (DeviceIntPtr pDevice) +

Referenced by dmxFixup(), dmxMotion(), and enqueueMotion().

-void dmxCommonSaveState (pointer private) +
+
+ +
+
+ + + + +
#define GETDMXLOCALFROMPDEVICE
+
+
+Value:
DevicePtr            pDev      = &pDevice->public;                  \
+    DMXLocalInputInfoPtr dmxLocal  = pDev->devicePrivate
+
+

Referenced by dmxBackendCreatePrivate(), dmxChangePointerControl(), dmxCommonCopyPrivate(), dmxConsoleCreatePrivate(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxPointerGetMotionEvents(), and dmxPointerPutMotionEvent().

+ +
+
+ +
+
+ + + + +
#define GETONLYPRIVFROMPRIVATE   myPrivate *priv = private
+
+
-void dmxCommonRestoreState (pointer private) +

Referenced by dmxConsoleDrawWindows(), dmxConsoleFunctions(), dmxConsoleUpdateInfo(), and dmxConsoleUpdatePosition().

- -

Detailed Description

-Interface to functions used by backend and console input devices.
See also:
dmxcommon.c

-dmxbackend.c

-dmxconsole.c

-

Function Documentation

-

- - - - -
- - - - - - - - + + + +
+
+
pointer dmxCommonCopyPrivate ( DeviceIntPtr  pDevice  ) 
+ + -
#define GETPRIVFROMPDEV
-
- - - - - -
-   - - -

-Returns a pointer to the private area for the device that comes just prior to pDevice in the current dmxInput device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.

-

- - - - -
- + +
+Value:
GETDMXLOCALFROMPDEV;                                                \
+    myPrivate            *priv     = dmxLocal->private
+
+

Referenced by dmxBackendCollectEvents(), dmxBackendInit(), dmxBackendInitPrivate(), dmxBackendLateReInit(), dmxCommonKbdBell(), dmxCommonKbdCtrl(), dmxCommonKbdGetInfo(), dmxCommonKbdGetMap(), dmxCommonKbdOff(), dmxCommonKbdOn(), dmxCommonMouCtrl(), dmxCommonMouGetMap(), dmxCommonMouOff(), dmxCommonMouOn(), dmxCommonOthGetInfo(), dmxCommonOthOff(), dmxCommonOthOn(), dmxConsoleCollectEvents(), dmxConsoleInit(), dmxConsoleMouGetInfo(), and dmxConsoleReInit().

+ +
+ + +
+
+
+ + + +
#define GETPRIVFROMPRIVATE
+ +
+Value:
GETONLYPRIVFROMPRIVATE;                                             \
+    DMXInputInfo         *dmxInput = &dmxInputs[priv->dmxLocal->inputIdx]
+
+

Referenced by dmxBackendProcessInput(), dmxBackendUpdatePosition(), dmxCommonRestoreState(), and dmxCommonSaveState().

+ +
+ +

Function Documentation

+ +
+
+ + + + + + + + + +
pointer dmxCommonCopyPrivate (DeviceIntPtr  pDevice ) 
+
+
+

Returns a pointer to the private area for the device that comes just prior to pDevice in the current dmxInput device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.

+ +

References _DMXInputInfo::devs, dmxInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::private.

+ +
+
+ +
+
+ - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxCommonKbdBell ( DevicePtr  pDev, void dmxCommonKbdBell (DevicePtr  pDev,
int  percent, int  percent,
int  volume, int  volume,
int  pitch, int  pitch,
int  durationint  duration 
) )
-
- - - - - -
-   - - -

-Sound they keyboard bell.

-

- - - - -
- + +
+

Sound they keyboard bell.

+ +

References GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonKbdCtrl ( DevicePtr  pDev, void dmxCommonKbdCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrlKeybdCtrl *  ctrl 
) )
-
- - - - - -
-   - - -

-Update the keyboard control.

-

- - - - -
- + +
+

Update the keyboard control.

+ +

References dmxCommonKbdSetCtrl(), dmxCommonSaveState(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonKbdGetInfo ( DevicePtr  pDev, void dmxCommonKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - - -

-Fill in the XKEYBOARD parts of the info structure for the specified pDev.

-

- - - - -
- + +
+

Fill in the XKEYBOARD parts of the info structure for the specified pDev.

+ +

References dmxCommonRestoreState(), dmxCommonSaveState(), dmxLogInput(), _DMXLocalInitInfo::freenames, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, NAME, and _DMXLocalInitInfo::names.

+ +

Referenced by dmxBackendKbdGetInfo(), and dmxConsoleKbdGetInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCommonKbdGetMap ( DevicePtr  pDev, void dmxCommonKbdGetMap (DevicePtr  pDev,
KeySymsPtr  pKeySyms, KeySymsPtr  pKeySyms,
CARD8 *  pModMapCARD8 *  pModMap 
) )
-
- - - - - -
-   - - -

-Get the keyboard mapping.

-

- - - - -
- + +
+

Get the keyboard mapping.

+ +

References GETPRIVFROMPDEV.

+ +

Referenced by dmxBackendKbdGetInfo(), and dmxConsoleKbdGetInfo().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonKbdOff ( DevicePtr  pDev  ) void dmxCommonKbdOff (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- + +
+

Turn pDev off.

+ +

References DMX_KEYBOARD_EVENT_MASK, dmxCommonRestoreState(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCommonKbdOn ( DevicePtr  pDev  ) int dmxCommonKbdOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References DMX_KEYBOARD_EVENT_MASK, dmxCommonSaveState(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonMouCtrl ( DevicePtr  pDev, void dmxCommonMouCtrl (DevicePtr  pDev,
PtrCtrl *  ctrlPtrCtrl *  ctrl 
) )
-
- - - - - -
-   - - -

-Update the mouse control.

-

- - - - -
- + +
+

Update the mouse control.

+ +

References dmxCommonMouSetCtrl(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCommonMouGetMap ( DevicePtr  pDev, void dmxCommonMouGetMap (DevicePtr  pDev,
unsigned char *  map, unsigned char *  map,
int *  nButtonsint *  nButtons 
) )
-
- - - - - -
-   - - -

-Obtain the mouse button mapping.

-

- - - - -
- + +
+

Obtain the mouse button mapping.

+ +

References DMX_MAX_BUTTONS, and GETPRIVFROMPDEV.

+ +

Referenced by dmxBackendMouGetInfo(), and dmxConsoleMouGetInfo().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonMouOff ( DevicePtr  pDev  ) void dmxCommonMouOff (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- + +
+

Turn pDev off.

+ +

References DMX_POINTER_EVENT_MASK, dmxCommonRemoveEnabledDevice(), dmxCommonXSelect(), dmxPropertyIterate(), GETDMXINPUTFROMPRIV, and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCommonMouOn ( DevicePtr  pDev  ) int dmxCommonMouOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References DMX_POINTER_EVENT_MASK, dmxCommonAddEnabledDevice(), dmxCommonXSelect(), dmxPropertyIterate(), dmxScreens, dmxShadowFB, dmxSync(), GETDMXINPUTFROMPRIV, and GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCommonOthGetInfo ( DevicePtr  pDev, void dmxCommonOthGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::buttonClass, display, dmxInputExtensionErrorHandler(), _DMXLocalInitInfo::focusClass, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numAbsAxes, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::proximityClass, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonOthOff ( DevicePtr  pDev  ) void dmxCommonOthOff (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off.

-

- - - - -
- + +
+

Turn pDev off.

+ +

References GETPRIVFROMPDEV.

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCommonOthOn ( DevicePtr  pDev  ) int dmxCommonOthOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References ADD, ChangeDeviceNotify, DeviceFocusIn, DeviceFocusOut, DeviceMappingNotify, DeviceMotionNotify, DeviceStateNotify, DMX_MAX_XINPUT_EVENT_TYPES, dmxLog(), dmxWarning, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, ProximityIn, and ProximityOut.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonRestoreState ( pointer  private  ) void dmxCommonRestoreState (pointer  private ) 
-
- - - - - -
-   - - -

-This routine restores all the information saved by dmxCommonSaveState.

-

- - - - -
- + +
+

This routine restores all the information saved by dmxCommonSaveState.

+ +

References dmxCommonKbdSetCtrl(), DMXDBG0, dmxLog(), dmxLogInput(), dmxWarning, and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendCollectEvents(), dmxCloseConsole(), dmxCommonKbdGetInfo(), dmxCommonKbdOff(), and dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCommonSaveState ( pointer  private  ) void dmxCommonSaveState (pointer  private ) 
-
- - - - - -
-   - - -

-This routine saves and resets some important state for the backend and console device drivers:

    -
  • the modifier map is saved and set to 0 (so DMX controls the LEDs)
  • the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using
-

-This routine and dmxCommonRestoreState are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).

-

- - - - -
- + +
+

This routine saves and resets some important state for the backend and console device drivers:

+
    +
  • the modifier map is saved and set to 0 (so DMX controls the LEDs)
    • +
  • the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using
    • +
+

This routine and dmxCommonRestoreState are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).

+ +

References dmxCommonKbdSetCtrl(), DMXDBG0, dmxLogInput(), dmxScreens, dmxSync(), dmxUseXKB, and GETPRIVFROMPRIVATE.

+ +

Referenced by dmxBackendCollectEvents(), dmxCommonKbdCtrl(), dmxCommonKbdGetInfo(), dmxCommonKbdOn(), and dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxFindPointerScreen ( int  x, int dmxFindPointerScreen (int  x,
int  yint  y 
) )
-
- - - - - -
-   - - -

-Given the global coordinates x and y, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into #dmxScreenInfo and is between -1 and dmxNumScreens - 1, inclusive.

+

+
+

Given the global coordinates x and y, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into dmxScreenInfo and is between -1 and dmxNumScreens - 1, inclusive.

+ +

References dmxNumScreens.

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html new file mode 100644 index 000000000..eb99e95dc --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html @@ -0,0 +1,156 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html index fe1f991ea..c8100f532 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html @@ -6,54 +6,240 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcompat.c File Reference

#include "dmxconfig.h"
-#include "dmxparse.h"
-#include "dmxcompat.h"
-#include "parser.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
- - - - - + + +
+

dmxcompat.c File Reference

#include "dmxconfig.h"
+#include "dmxparse.h"
+#include "dmxcompat.h"
+#include "parser.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+

Functions

DMXConfigEntryPtr dmxVDLRead (const char *filename)
+ + + + + +

Functions

static int dmxVDLReadLine (FILE *str, char *buf, int len)
static int dmxVDLCount (const char *buf)
static void dmxVDLVirtualEntry (const char *buf, char *name, int *len, int *x, int *y)
static void dmxVDLDisplayEntry (const char *buf, char *name, int *len, int *x, int *y, int *xoff, int *yoff, int *xorig, int *yorig)
DMXConfigEntryPtr dmxVDLRead (const char *filename)
-

Detailed Description

-This file provides some compatibility support for reading VDL files that are used by xmovie (http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml).

-This file is not used by the DMX server.

Function Documentation

-

- - - - -
- - - - - - - - +

Detailed Description

+

This file provides some compatibility support for reading VDL files that are used by xmovie (http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml).

+

This file is not used by the DMX server.

+

Function Documentation

+ +
+
+
DMXConfigEntryPtr dmxVDLRead ( const char *  filename  ) 
+ + + + + + + +
static int dmxVDLCount (const char *  buf )  [static]
+ +
+ +

Referenced by dmxVDLRead().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxVDLDisplayEntry (const char *  buf,
char *  name,
int *  len,
int *  x,
int *  y,
int *  xoff,
int *  yoff,
int *  xorig,
int *  yorig 
) [static]
-
- - - - - -
-   - + +
-

-Read from the VDL format filename and return a newly allocated DMXConfigEntryPtr

+

Referenced by dmxVDLRead().

+ + + + +
+
+ + + + + + + + + +
DMXConfigEntryPtr dmxVDLRead (const char *  filename ) 
+
+
+

Read from the VDL format filename and return a newly allocated DMXConfigEntryPtr

+ +

References display, dmxConfigAddEntry(), dmxConfigAddSub(), dmxConfigComment, dmxConfigCopyString(), dmxConfigCreateComment(), dmxConfigCreateDisplay(), dmxConfigCreateFullDim(), dmxConfigCreatePair(), dmxConfigCreatePartDim(), dmxConfigCreateString(), dmxConfigCreateVirtual(), dmxConfigSubDisplay(), dmxConfigVirtual, dmxVDLCount(), dmxVDLDisplayEntry(), dmxVDLReadLine(), dmxVDLVirtualEntry(), and str.

+ +

Referenced by main().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static int dmxVDLReadLine (FILE *  str,
char *  buf,
int  len 
) [static]
+
+
+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxVDLVirtualEntry (const char *  buf,
char *  name,
int *  len,
int *  x,
int *  y 
) [static]
+
+
+ +

Referenced by dmxVDLRead().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html deleted file mode 100644 index 5199ae022..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcompat.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00041 #ifndef _DMXCOMPAT_H_
-00042 #define _DMXCOMPAT_H_
-00043 
-00044 extern DMXConfigEntryPtr dmxVDLRead(const char *filename);
-00045 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html index ab3412ac7..4fc44d7fa 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html @@ -6,48 +6,58 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxcompat.h File Reference

-

-Go to the source code of this file. - - - - +

Go to the source code of this file.

+

Functions

DMXConfigEntryPtr dmxVDLRead (const char *filename)
+ +

Functions

DMXConfigEntryPtr dmxVDLRead (const char *filename)
-

Detailed Description

-Interface to VDL compatibility support.
See also:
dmxcompat.c
-This file is not used by the DMX server.

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to VDL compatibility support.

+
See also:
dmxcompat.c
+

This file is not used by the DMX server.

+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
DMXConfigEntryPtr dmxVDLRead ( const char *  filename  ) DMXConfigEntryPtr dmxVDLRead (const char *  filename ) 
-
- - - - - -
-   - + +
+

Read from the VDL format filename and return a newly allocated DMXConfigEntryPtr

-

-Read from the VDL format filename and return a newly allocated DMXConfigEntryPtr

+

References display, dmxConfigAddEntry(), dmxConfigAddSub(), dmxConfigComment, dmxConfigCopyString(), dmxConfigCreateComment(), dmxConfigCreateDisplay(), dmxConfigCreateFullDim(), dmxConfigCreatePair(), dmxConfigCreatePartDim(), dmxConfigCreateString(), dmxConfigCreateVirtual(), dmxConfigSubDisplay(), dmxConfigVirtual, dmxVDLCount(), dmxVDLDisplayEntry(), dmxVDLReadLine(), dmxVDLVirtualEntry(), and str.

+ +

Referenced by main().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html new file mode 100644 index 000000000..16b073d47 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html @@ -0,0 +1,74 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html index a20ab1c26..1a404fc5f 100644 --- a/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html @@ -6,388 +6,849 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxconfig.c File Reference

#include "dmx.h"
-#include "dmxinput.h"
-#include "dmxconfig.h"
-#include "dmxparse.h"
-#include "dmxlog.h"
-#include "dmxcb.h"
-#include "dmxstat.h"
-#include "parser.h"
- - - - + + +
+

dmxconfig.c File Reference

#include "dmx.h"
+#include "dmxinput.h"
+#include "dmxconfig.h"
+#include "dmxparse.h"
+#include "dmxlog.h"
+#include "dmxcb.h"
+#include "dmxstat.h"
+#include "parser.h"
+

Data Structures

struct  DMXConfigCmdStruct
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  DMXConfigListStruct
struct  DMXConfigCmdStruct

Defines

#define GEN(param, glob, def)

Typedefs

typedef struct DMXConfigListStruct DMXConfigList
typedef struct
+DMXConfigListStruct * 		DMXConfigListPtr
typedef struct DMXConfigCmdStruct DMXConfigCmd
typedef struct DMXConfigCmdStruct * DMXConfigCmdPtr

Functions

int yyparse (void)
void dmxConfigStoreDisplay (const char *display)
void dmxConfigStoreInput (const char *input)
void dmxConfigStoreXInput (const char *input)
void dmxConfigStoreFile (const char *file)
void dmxConfigStoreConfig (const char *config)
static int dmxConfigReadFile (const char *filename, int debug)
static const char * dmxConfigMatch (const char *target, DMXConfigEntryPtr entry)
static DMXScreenInfo * dmxConfigAddDisplay (const char *name, int scrnWidth, int scrnHeight, int scrnX, int scrnY, int scrnXSign, int scrnYSign, int rootWidth, int rootHeight, int rootX, int rootY, int rootXSign, int rootYSign)
DMXInputInfo * dmxConfigAddInput (const char *name, int core)
static void dmxConfigCopyFromDisplay (DMXConfigDisplayPtr d)
static void dmxConfigCopyFromWall (DMXConfigWallPtr w)
static void dmxConfigCopyFromOption (DMXConfigOptionPtr o)
static void dmxConfigCopyFromParam (DMXConfigParamPtr p)
static void dmxConfigCopyData (DMXConfigVirtualPtr v)
static void dmxConfigFromCommandLine (void)
static void dmxConfigFromConfigFile (void)
static void dmxConfigConfigInputs (void)
void dmxConfigConfigure (void)
void dmxConfigSetMaxScreens (void)

Variables

FILE * yyin
static char * dmxXkbRules
static char * dmxXkbModel
static char * dmxXkbLayout
static char * dmxXkbVariant
static char * dmxXkbOptions
DMXConfigEntryPtr dmxConfigEntry
static DMXConfigCmd dmxConfigCmd
static int dmxDisplaysFromCommandLine
+

Detailed Description

+

Provides interface for reading DMX configuration files and for combining that information with command-line configuration parameters.

+

Define Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define GEN(param,
glob,
def  ) 
+
+
+Value:
void dmxConfigSet##glob(const char *param) {                                 \
+     if (dmx##glob) free((void *)dmx##glob);                                  \
+     dmx##glob = strdup(param);                                               \
+ }                                                                            \
+ char *dmxConfigGet##glob(void) {                                             \
+     return (char *)(dmx##glob ? dmx##glob : def);                            \
+ }
+

This macro is used to generate the following access methods:

+
    +
  • dmxConfig{Set,Get}rules
    • +
  • dmxConfig{Set,Get}model
    • +
  • dmxConfig{Set,Get}layout
    • +
  • dmxConfig{Set,Get}variant
    • +
  • dmxConfig{Set,Get}options These methods are used to read and write information about the keyboard.
    • +
+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct DMXConfigCmdStruct DMXConfigCmd
+
+
+

This stucture stores the parsed configuration information.

+ +
+
+ +
+
+ + + + +
typedef struct DMXConfigCmdStruct * DMXConfigCmdPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct DMXConfigListStruct DMXConfigList
+
+
+

Stores lists of configuration information.

+ +
+
+ +
+
+ + + + +
typedef struct DMXConfigListStruct * DMXConfigListPtr
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static DMXScreenInfo* dmxConfigAddDisplay (const char *  name,
int  scrnWidth,
int  scrnHeight,
int  scrnX,
int  scrnY,
int  scrnXSign,
int  scrnYSign,
int  rootWidth,
int  rootHeight,
int  rootX,
int  rootY,
int  rootXSign,
int  rootYSign 
) [static]
+
+
-struct  DMXConfigListStruct +

References dmxFatal, dmxLog(), dmxNumScreens, dmxScreens, dmxStatAlloc(), _DMXScreenInfo::index, _DMXScreenInfo::name, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnXSign, _DMXScreenInfo::scrnY, _DMXScreenInfo::scrnYSign, and _DMXScreenInfo::stat.

-

Defines

-#define GEN(param, glob, def) +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCopyFromWall(), and dmxConfigFromCommandLine().

-

Typedefs

-typedef DMXConfigListStruct DMXConfigList +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXInputInfo* dmxConfigAddInput (const char *  name,
int  core 
)
+
+
-typedef DMXConfigListStruct * DMXConfigListPtr +

References _DMXInputInfo::core, dmxFatal, dmxInputs, dmxLog(), dmxNumInputs, _DMXInputInfo::inputIdx, _DMXInputInfo::name, and _DMXInputInfo::scrnIdx.

-typedef DMXConfigCmdStruct DMXConfigCmd +

Referenced by dmxConfigConfigInputs(), dmxInputAttachBackend(), and dmxInputAttachConsole().

-typedef DMXConfigCmdStruct * DMXConfigCmdPtr +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigConfigInputs (void  )  [static]
+
+
-

Functions

-void dmxConfigStoreDisplay (const char *display) +

References dmxConfigAddInput(), dmxNumInputs, dmxNumScreens, dmxScreens, DMXConfigCmdStruct::inputs, DMXConfigListStruct::name, DMXConfigListStruct::next, and DMXConfigCmdStruct::xinputs.

-void dmxConfigStoreInput (const char *input) +

Referenced by dmxConfigConfigure().

-void dmxConfigStoreXInput (const char *input) +
+
+ +
+
+ + + + + + + + + +
void dmxConfigConfigure (void  ) 
+
+
+

Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.

-void dmxConfigStoreFile (const char *file) +

References DMXConfigCmdStruct::config, DMXConfigCmdStruct::displays, dmxConfigConfigInputs(), dmxConfigFreeEntry(), dmxConfigFromCommandLine(), dmxConfigFromConfigFile(), dmxConfigReadFile(), dmxLog(), dmxWarning, and DMXConfigCmdStruct::filename.

-void dmxConfigStoreConfig (const char *config) +

Referenced by dmxConfigSetMaxScreens(), and InitOutput().

-void dmxConfigConfigure (void) +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigCopyData (DMXConfigVirtualPtr  v )  [static]
+
+
-void dmxConfigSetMaxScreens (void) +

References _DMXConfigVirtual::dim, _DMXConfigSub::display, dmxConfigCopyFromDisplay(), dmxConfigCopyFromOption(), dmxConfigCopyFromParam(), dmxConfigCopyFromWall(), dmxConfigDisplay, dmxConfigOption, dmxConfigParam, dmxConfigWall, dmxFatal, dmxLog(), dmxSetWidthHeight(), _DMXConfigSub::next, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigVirtual::subentry, _DMXConfigSub::type, _DMXConfigSub::wall, _DMXConfigPair::x, and _DMXConfigPair::y.

- -

Detailed Description

-Provides interface for reading DMX configuration files and for combining that information with command-line configuration parameters.

Define Documentation

-

- - - +

Referenced by dmxConfigSetMaxScreens(), and InitOutput().

- + + + +
+
+
- - - - - - - - - - - - - - - -
#define GEN( param,
glob,
def   )  +

Referenced by dmxConfigFromConfigFile().

+ + + + +
+
+ + + + + + + + +
static void dmxConfigCopyFromDisplay (DMXConfigDisplayPtr  d )  [static]
-
- - - - - -
-   - - -

-Value:

void dmxConfigSet##glob(const char *param) {                                 \
-     if (dmx##glob) free((void *)dmx##glob);                                  \
-     dmx##glob = strdup(param);                                               \
- }                                                                            \
- char *dmxConfigGet##glob(void) {                                             \
-     return (char *)(dmx##glob ? dmx##glob : def);                            \
- }
-
This macro is used to generate the following access methods:
    -
  • dmxConfig{Set,Get}rules
  • dmxConfig{Set,Get}model
  • dmxConfig{Set,Get}layout
  • dmxConfig{Set,Get}variant
  • dmxConfig{Set,Get}options These methods are used to read and write information about the keyboard.
-
-

Typedef Documentation

-

- - - - -
- + +
+ +

References dmxConfigAddDisplay(), _DMXConfigDisplay::name, PosAbsolute, _DMXConfigDisplay::rootHeight, _DMXConfigDisplay::rootWidth, _DMXConfigDisplay::rootX, _DMXConfigDisplay::rootXOrigin, _DMXConfigDisplay::rootXSign, _DMXConfigDisplay::rootY, _DMXConfigDisplay::rootYOrigin, _DMXConfigDisplay::scrnHeight, _DMXConfigDisplay::scrnWidth, _DMXConfigDisplay::scrnX, _DMXConfigDisplay::scrnXSign, _DMXConfigDisplay::scrnY, _DMXConfigDisplay::scrnYSign, _DMXScreenInfo::where, _DMXScreenInfo::whereX, and _DMXScreenInfo::whereY.

+ +

Referenced by dmxConfigCopyData().

+ +
+ + +
+
+
- + + + + + +
typedef struct DMXConfigCmdStruct DMXConfigCmd + static void dmxConfigCopyFromOption (DMXConfigOptionPtr  o )  [static]
-
- - - - - -
-   - - -

-This stucture stores the parsed configuration information.

-

- - - - -
- + +
+ +

References _DMXConfigString::next, _DMXConfigOption::option, _DMXConfigString::string, and _DMXConfigOption::string.

+ +

Referenced by dmxConfigCopyData().

+ +
+ + +
+
+
- + + + + + +
typedef struct DMXConfigCmdStruct * DMXConfigCmdPtr + static void dmxConfigCopyFromParam (DMXConfigParamPtr  p )  [static]
-
- - - - - -
-   - - -

-This stucture stores the parsed configuration information.

-

- - - - -
- + +
+ +

References dmxConfigLookupParam(), dmxConfigSetXkbLayout(), dmxConfigSetXkbModel(), dmxConfigSetXkbOptions(), dmxConfigSetXkbRules(), and dmxConfigSetXkbVariant().

+ +

Referenced by dmxConfigCopyData().

+ +
+ + +
+
+
- + + + + + +
typedef struct DMXConfigListStruct DMXConfigList + static void dmxConfigCopyFromWall (DMXConfigWallPtr  w )  [static]
-
- - - - - -
-   - - -

-Stores lists of configuration information.

-

- - - - -
- + +
+ +

References dmxConfigAddDisplay(), dmxInfo, dmxLog(), dmxNumScreens, dmxScreens, _DMXConfigWall::height, _DMXScreenInfo::name, _DMXConfigWall::nameList, _DMXConfigString::next, PosAbsolute, PosBelow, PosRightOf, _DMXConfigString::string, _DMXScreenInfo::where, _DMXScreenInfo::whereRefScreen, _DMXScreenInfo::whereX, _DMXScreenInfo::whereY, _DMXConfigWall::width, _DMXConfigWall::xwall, and _DMXConfigWall::ywall.

+ +

Referenced by dmxConfigCopyData().

+ +
+ + +
+
+
- + + + + + +
typedef struct DMXConfigListStruct * DMXConfigListPtr + static void dmxConfigFromCommandLine (void  )  [static]
-
- - - - - -
-   - - -

-Stores lists of configuration information.

-

Function Documentation

-

- - - - -
- + +
+ +

References DMXConfigCmdStruct::displays, dmxConfigAddDisplay(), dmxInfo, dmxLog(), dmxNumScreens, dmxScreens, _DMXScreenInfo::name, DMXConfigListStruct::name, DMXConfigListStruct::next, PosAbsolute, PosBelow, PosRightOf, _DMXScreenInfo::where, _DMXScreenInfo::whereRefScreen, _DMXScreenInfo::whereX, and _DMXScreenInfo::whereY.

+ +

Referenced by dmxConfigConfigure().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigConfigure ( void   ) static void dmxConfigFromConfigFile (void  )  [static]
+ +
+

References DMXConfigCmdStruct::config, dmxConfigCopyData(), dmxConfigMatch(), dmxConfigVirtual, dmxFatal, dmxInfo, dmxLog(), DMXConfigCmdStruct::filename, _DMXConfigEntry::next, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigConfigure().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
static const char* dmxConfigMatch (const char *  target,
DMXConfigEntryPtr  entry 
) [static]
-
- - - - - -
-   - - -

-Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.

-

- - - - -
- + +
+ +

References DMXConfigCmdStruct::config, _DMXConfigVirtual::name, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigFromConfigFile().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
static int dmxConfigReadFile (const char *  filename,
void dmxConfigSetMaxScreens ( void   ) int  debug 
) [static]
+ +
+

References dmxInfo, dmxLog(), str, yydebug, yyin, and yyparse().

+ +

Referenced by dmxConfigConfigure().

+ +
+ + +
+
+ + + + + + + + +
void dmxConfigSetMaxScreens (void  ) 
-
- - - - - -
-   - - -

-This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.

-

- - - - -
- + +
+

This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.

+ +

References dmxConfigConfigure(), dmxDisplaysFromCommandLine, dmxNumScreens, and DMXConfigCmdStruct::filename.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreConfig ( const char *  config  ) void dmxConfigStoreConfig (const char *  config ) 
+ +
+

Make a note that config should be used as the configuration for current instantiation of the DMX server.

+ +

References DMXConfigCmdStruct::config, dmxFatal, and dmxLog().

+ +

Referenced by ddxProcessArgument().

+
+ + +
+
+ + + + + + + + +
void dmxConfigStoreDisplay (const char *  display ) 
-
- - - - - -
-   - - -

-Make a note that config should be used as the configuration for current instantiation of the DMX server.

-

- - - - -
- + +
+

Make a note that display is the name of an X11 display that should be initialized as a backend (output) display. Called from ddxProcessArgument.

+ +

References DMXConfigCmdStruct::displays, dmxDisplaysFromCommandLine, dmxFatal, dmxLog(), DMXConfigListStruct::name, and DMXConfigListStruct::next.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreDisplay ( const char *  display  ) void dmxConfigStoreFile (const char *  file ) 
+ +
+

Make a note that file is the configuration file.

+ +

References dmxFatal, dmxLog(), and DMXConfigCmdStruct::filename.

+

Referenced by ddxProcessArgument().

+ +
+ + +
+
+ + + + + + + + +
void dmxConfigStoreInput (const char *  input ) 
-
- - - - - -
-   - - -

-Make a note that display is the name of an X11 display that should be initialized as a backend (output) display. Called from ddxProcessArgument.

-

- - - - -
- + +
+

Make a note that input is the name of an X11 display that should be used for input (either a backend or a console input device).

+ +

References dmxFatal, dmxLog(), DMXConfigCmdStruct::inputs, DMXConfigListStruct::name, and DMXConfigListStruct::next.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreFile ( const char *  file  ) void dmxConfigStoreXInput (const char *  input ) 
+ +
+

Make a note that input is the name of an X11 display that should be used for input from XInput extension devices.

+

References dmxFatal, dmxLog(), DMXConfigListStruct::name, DMXConfigListStruct::next, and DMXConfigCmdStruct::xinputs.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+ + + + + + + + +
int yyparse (void  ) 
-
- - - - - -
-   - - -

-Make a note that file is the configuration file.

-

- - - - -
- + +
+ +

Referenced by dmxConfigReadFile(), and main().

+ +
+ +

Variable Documentation

+ +
+
+
- - - - - - + -
void dmxConfigStoreInput ( const char *  input  ) DMXConfigCmd dmxConfigCmd [static]
-
- - - - - -
-   - - -

-Make a note that input is the name of an X11 display that should be used for input (either a backend or a console input device).

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - - - + +
void dmxConfigStoreXInput ( const char *  input  ) DMXConfigEntryPtr dmxConfigEntry
+ +
+ +

Referenced by main().

+
+ + +
+
+ + + +
int dmxDisplaysFromCommandLine [static]
-
- - - - - -
-   - - -

-Make a note that input is the name of an X11 display that should be used for input from XInput extension devices.

+ +

+ +

Referenced by dmxConfigSetMaxScreens(), and dmxConfigStoreDisplay().

+ +
+ + +
+
+ + + + +
char* dmxXkbLayout [static]
+
+
+ +
+
+ +
+
+ + + + +
char* dmxXkbModel [static]
+
+
+ +
+
+ +
+
+ + + + +
char* dmxXkbOptions [static]
+
+
+ +
+
+ +
+
+ + + + +
char* dmxXkbRules [static]
+
+
+ +
+
+ +
+
+ + + + +
char* dmxXkbVariant [static]
+
+
+ +
+
+ +
+
+ + + + +
FILE* yyin
+
+
+ +

Referenced by dmxConfigReadFile().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html deleted file mode 100644 index eeaae6481..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxconfig.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXCONFIG_H_
-00039 #define _DMXCONFIG_H_
-00040 #define DMX_DEFAULT_XKB_RULES  "xfree86"
-00041 #define DMX_DEFAULT_XKB_MODEL  "pc101"
-00042 #define DMX_DEFAULT_XKB_LAYOUT "us"
-00043 #define DMX_DEFAULT_XKB_VARIANT NULL
-00044 #define DMX_DEFAULT_XKB_OPTIONS NULL
-00045 
-00046 extern void dmxConfigStoreDisplay(const char *display);
-00047 extern void dmxConfigStoreInput(const char *input); /* Core devices */
-00048 extern void dmxConfigStoreXInput(const char *input); /* Non-core devices */
-00049 extern void dmxConfigStoreFile(const char *file);
-00050 extern void dmxConfigStoreConfig(const char *config);
-00051 extern void dmxConfigConfigure(void);
-00052 extern void dmxConfigSetMaxScreens(void);
-00053 
-00054 extern void dmxConfigSetXkbRules(const char *rules);
-00055 extern void dmxConfigSetXkbModel(const char *model);
-00056 extern void dmxConfigSetXkbLayout(const char *layout);
-00057 extern void dmxConfigSetXkbVariant(const char *variant);
-00058 extern void dmxConfigSetXkbOptions(const char *options);
-00059 
-00060 extern char *dmxConfigGetXkbRules(void);
-00061 extern char *dmxConfigGetXkbModel(void);
-00062 extern char *dmxConfigGetXkbLayout(void);
-00063 extern char *dmxConfigGetXkbVariant(void);
-00064 extern char *dmxConfigGetXkbOptions(void);
-00065 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html index 76c2eb03d..72d5e1e57 100644 --- a/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html @@ -6,234 +6,412 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxconfig.h File Reference

-

-Go to the source code of this file. - - - + + +
+

dmxconfig.h File Reference

#include <xkb-config.h>
-
+

Go to the source code of this file.

+

Functions

void dmxConfigStoreDisplay (const char *display)
void dmxConfigStoreInput (const char *input)
+ + + + + + + + + + + + + + + + + + +

Functions

void dmxConfigStoreDisplay (const char *display)
void dmxConfigStoreInput (const char *input)
void dmxConfigStoreXInput (const char *input)
void dmxConfigStoreFile (const char *file)
void dmxConfigStoreConfig (const char *config)
void dmxConfigConfigure (void)
void dmxConfigSetMaxScreens (void)
void dmxConfigSetXkbRules (const char *rules)
void dmxConfigSetXkbModel (const char *model)
void dmxConfigSetXkbLayout (const char *layout)
void dmxConfigSetXkbVariant (const char *variant)
void dmxConfigSetXkbOptions (const char *options)
char * dmxConfigGetXkbRules (void)
char * dmxConfigGetXkbModel (void)
char * dmxConfigGetXkbLayout (void)
char * dmxConfigGetXkbVariant (void)
char * dmxConfigGetXkbOptions (void)
+

Detailed Description

+

Interface for DMX configuration file support.

+
See also:
dmxconfig.c
+

Function Documentation

+ +
+
+ + + + + + + + + +
void dmxConfigConfigure (void  ) 
+
+
+

Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.

+ +

References DMXConfigCmdStruct::config, DMXConfigCmdStruct::displays, dmxConfigConfigInputs(), dmxConfigFreeEntry(), dmxConfigFromCommandLine(), dmxConfigFromConfigFile(), dmxConfigReadFile(), dmxLog(), dmxWarning, and DMXConfigCmdStruct::filename.

-
void dmxConfigStoreXInput (const char *input)
void dmxConfigStoreFile (const char *file)
+ + + + + + + + +
char* dmxConfigGetXkbLayout (void  ) 
+

+
-void dmxConfigStoreConfig (const char *config) +

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

-void dmxConfigConfigure (void) +
+
+ +
+
+ + + + + + + + + +
char* dmxConfigGetXkbModel (void  ) 
+
+
-void dmxConfigSetMaxScreens (void) +

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

- -

Detailed Description

-Interface for DMX configuration file support.
See also:
dmxconfig.c
-

Function Documentation

-

- - - - -
- - - - - - - - - - -
void dmxConfigConfigure ( void   ) 
-
- - - - - -
-   - - -

-Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
void dmxConfigSetMaxScreens ( void   ) char* dmxConfigGetXkbOptions (void  ) 
+ +
+

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

+ +
+ + +
+
+ + + + + + + + +
char* dmxConfigGetXkbRules (void  ) 
-
- - - - - -
-   - - -

-This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.

-

- - - - -
- + +
+ +

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreConfig ( const char *  config  ) char* dmxConfigGetXkbVariant (void  ) 
+ +
+

Referenced by dmxDeviceOnOff(), and dmxKeyboardOn().

+ +
+ + +
+
+ + + + + + + + +
void dmxConfigSetMaxScreens (void  ) 
-
- - - - - -
-   - - -

-Make a note that config should be used as the configuration for current instantiation of the DMX server.

-

- - - - -
- + +
+

This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.

+ +

References dmxConfigConfigure(), dmxDisplaysFromCommandLine, dmxNumScreens, and DMXConfigCmdStruct::filename.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreDisplay ( const char *  display  ) void dmxConfigSetXkbLayout (const char *  layout ) 
+ +
+ +

Referenced by ddxProcessArgument(), and dmxConfigCopyFromParam().

+
+ + +
+
+ + + + + + + + +
void dmxConfigSetXkbModel (const char *  model ) 
-
- - - - - -
-   - - -

-Make a note that display is the name of an X11 display that should be initialized as a backend (output) display. Called from ddxProcessArgument.

-

- - - - -
- + +
+ +

Referenced by ddxProcessArgument(), and dmxConfigCopyFromParam().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreFile ( const char *  file  ) void dmxConfigSetXkbOptions (const char *  options ) 
+ +
+ +

Referenced by ddxProcessArgument(), and dmxConfigCopyFromParam().

+
+ + +
+
+ + + + + + + + +
void dmxConfigSetXkbRules (const char *  rules ) 
-
- - - - - -
-   - - -

-Make a note that file is the configuration file.

-

- - - - -
- + +
+ +

Referenced by ddxProcessArgument(), and dmxConfigCopyFromParam().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreInput ( const char *  input  ) void dmxConfigSetXkbVariant (const char *  variant ) 
+ +
+ +

Referenced by ddxProcessArgument(), and dmxConfigCopyFromParam().

+
+ + +
+
+ + + + + + + + +
void dmxConfigStoreConfig (const char *  config ) 
-
- - - - - -
-   - - -

-Make a note that input is the name of an X11 display that should be used for input (either a backend or a console input device).

-

- - - - -
- + +
+

Make a note that config should be used as the configuration for current instantiation of the DMX server.

+ +

References DMXConfigCmdStruct::config, dmxFatal, and dmxLog().

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConfigStoreXInput ( const char *  input  ) void dmxConfigStoreDisplay (const char *  display ) 
+ +
+

Make a note that display is the name of an X11 display that should be initialized as a backend (output) display. Called from ddxProcessArgument.

+ +

References DMXConfigCmdStruct::displays, dmxDisplaysFromCommandLine, dmxFatal, dmxLog(), DMXConfigListStruct::name, and DMXConfigListStruct::next.

+ +

Referenced by ddxProcessArgument().

+
+ + +
+
+ + + + + + + + +
void dmxConfigStoreFile (const char *  file ) 
-
- - - - - -
-   - - -

-Make a note that input is the name of an X11 display that should be used for input from XInput extension devices.

+

+
+

Make a note that file is the configuration file.

+ +

References dmxFatal, dmxLog(), and DMXConfigCmdStruct::filename.

+ +

Referenced by ddxProcessArgument().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigStoreInput (const char *  input ) 
+
+
+

Make a note that input is the name of an X11 display that should be used for input (either a backend or a console input device).

+ +

References dmxFatal, dmxLog(), DMXConfigCmdStruct::inputs, DMXConfigListStruct::name, and DMXConfigListStruct::next.

+ +

Referenced by ddxProcessArgument().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigStoreXInput (const char *  input ) 
+
+
+

Make a note that input is the name of an X11 display that should be used for input from XInput extension devices.

+ +

References dmxFatal, dmxLog(), DMXConfigListStruct::name, DMXConfigListStruct::next, and DMXConfigCmdStruct::xinputs.

+ +

Referenced by ddxProcessArgument().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html new file mode 100644 index 000000000..836bd94be --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html @@ -0,0 +1,94 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html index 026847587..1ee466b09 100644 --- a/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html @@ -6,484 +6,1468 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxconsole.c File Reference

#include "dmxinputinit.h"
-#include "dmxevents.h"
-#include "dmxconsole.h"
-#include "dmxcommon.h"
-#include "dmxscrinit.h"
-#include "dmxcb.h"
-#include "dmxsync.h"
-#include "inputstr.h"
-#include "input.h"
-#include "mipointer.h"
-#include "windowstr.h"
- - - - + + +
+

dmxconsole.c File Reference

#include "dmxinputinit.h"
+#include "dmxevents.h"
+#include "dmxconsole.h"
+#include "dmxcommon.h"
+#include "dmxscrinit.h"
+#include "dmxcb.h"
+#include "dmxsync.h"
+#include "inputstr.h"
+#include "input.h"
+#include "mipointer.h"
+#include "windowstr.h"
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define DMX_CONSOLE_DEBUG   0
#define DMX_WINDOW_DEBUG   0
#define CONSOLE_NUM   3
#define CONSOLE_DEN   4
#define DMX_CONSOLE_NAME   "DMX Console"
#define DMX_RES_NAME   "Xdmx"
#define DMX_RES_CLASS   "XDmx"
#define CONSOLE_BG_COLOR   "gray75"
#define CONSOLE_FG_COLOR   "black"
#define CONSOLE_SCREEN_BG_COLOR   "white"
#define CONSOLE_SCREEN_FG_COLOR   "black"
#define CONSOLE_SCREEN_DET_COLOR   "gray75"
#define CONSOLE_SCREEN_CUR_COLOR   "red"
#define DMXDBG0(f)
#define DMXDBG1(f, a)
#define DMXDBG2(f, a, b)
#define DMXDBG3(f, a, b, c)
#define DMXDBG4(f, a, b, c, d)
#define DMXDBG5(f, a, b, c, d, e)
#define DMXDBG6(f, a, b, c, d, e, g)
#define DMXDBG7(f, a, b, c, d, e, g, h)

Typedefs

typedef struct _myPrivate myPrivate

Functions

static int scalex (myPrivate *priv, int x)
static int scaley (myPrivate *priv, int y)
static int unscalex (myPrivate *priv, int x)
static int unscaley (myPrivate *priv, int y)
pointer dmxConsoleCreatePrivate (DeviceIntPtr pDevice)
void dmxConsoleDestroyPrivate (pointer private)
static void dmxConsoleDrawFineCursor (myPrivate *priv, XRectangle *rect)
static void dmxConsoleDrawWindows (pointer private)
static void dmxConsoleDraw (myPrivate *priv, int updateCursor, int update)
static void dmxConsoleClearCursor (myPrivate *priv, int x, int y, XRectangle *rect)
static void dmxConsoleUpdateFineCursor (myPrivate *priv)
void dmxConsoleUpdateInfo (pointer private, DMXUpdateType type, WindowPtr pWindow)
static void dmxConsoleMoveAbsolute (myPrivate *priv, int x, int y, DevicePtr pDev, dmxMotionProcPtr motion, DMXBlockType block)
static void dmxConsoleMoveRelative (myPrivate *priv, int x, int y, DevicePtr pDev, dmxMotionProcPtr motion, DMXBlockType block)
void dmxConsoleUpdatePosition (pointer private, int x, int y)
void dmxConsoleCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
static void dmxCloseConsole (myPrivate *priv)
static Bool dmxCloseConsoleScreen (int idx, ScreenPtr pScreen)
static Cursor dmxConsoleCreateEmptyCursor (myPrivate *priv)
static void dmxConsoleComputeWidthHeight (myPrivate *priv, int *width, int *height, double *xScale, double *yScale, int *consWidth, int *consHeight)
void dmxConsoleReInit (DevicePtr pDev)
void dmxConsoleInit (DevicePtr pDev)
void dmxConsoleMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxConsoleKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int dmxConsoleFunctions (pointer private, DMXFunctionType function)
static void dmxDump (void)
void dmxConsoleCapture (DMXInputInfo *dmxInput)
void dmxConsoleUncapture (DMXInputInfo *dmxInput)
+

Detailed Description

+

This file implements the console input devices.

+

Define Documentation

+ +
+
+ + + + +
#define CONSOLE_BG_COLOR   "gray75"
+
+
-

Functions

-pointer dmxConsoleCreatePrivate (DeviceIntPtr pDevice) +

Referenced by dmxConsoleInit().

-void dmxConsoleDestroyPrivate (pointer private) +
+
+ +
+
+ + + + +
#define CONSOLE_DEN   4
+
+
-void dmxConsoleUpdateInfo (pointer private, DMXUpdateType type, WindowPtr pWindow) +

Referenced by dmxConsoleComputeWidthHeight().

-void dmxConsoleUpdatePosition (pointer private, int x, int y) +
+
+ +
+
+ + + + +
#define CONSOLE_FG_COLOR   "black"
+
+
-void dmxConsoleCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block) +
+
+ +
+
+ + + + +
#define CONSOLE_NUM   3
+
+
-void dmxConsoleReInit (DevicePtr pDev) +

Referenced by dmxConsoleComputeWidthHeight().

-void dmxConsoleInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define CONSOLE_SCREEN_BG_COLOR   "white"
+
+
-void dmxConsoleMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +

Referenced by dmxConsoleInit().

-void dmxConsoleKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + +
#define CONSOLE_SCREEN_CUR_COLOR   "red"
+
+
-int dmxConsoleFunctions (pointer private, DMXFunctionType function) +

Referenced by dmxConsoleInit().

-void dmxConsoleCapture (DMXInputInfo *dmxInput) +
+
+ +
+
+ + + + +
#define CONSOLE_SCREEN_DET_COLOR   "gray75"
+
+
-void dmxConsoleUncapture (DMXInputInfo *dmxInput) +

Referenced by dmxConsoleInit().

- -

Detailed Description

-This file implements the console input devices.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + +
void dmxConsoleCapture ( DMXInputInfo *  dmxInput  ) #define CONSOLE_SCREEN_FG_COLOR   "black"
+ +
+

Referenced by dmxConsoleInit().

+ +
+ + +
+
+ + + +
#define DMX_CONSOLE_DEBUG   0
-
- - - - - -
-   - - -

-This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + +
#define DMX_CONSOLE_NAME   "DMX Console"
+ +
+ +

Referenced by dmxConsoleInit().

+ +
+ + +
+
+ + + + +
#define DMX_RES_CLASS   "XDmx"
+
+
+ +

Referenced by dmxConsoleInit().

+ +
+
+ +
+
+ + + + +
#define DMX_RES_NAME   "Xdmx"
+
+
+ +

Referenced by dmxConsoleInit().

+ +
+
+ +
+
+ + + + +
#define DMX_WINDOW_DEBUG   0
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define DMXDBG0(f  ) 
+
+
+ +
+
+ +
+
+ - - - - + + + + + + + + + +
void dmxConsoleCollectEvents ( DevicePtr  pDev, #define DMXDBG1(f,
a  ) 
+
+
+ +
+
+ +
+
+ + + + + + + + - - + + + + + - - +
#define DMXDBG2(f,
dmxMotionProcPtr  motion, a,
b  )  dmxEnqueueProcPtr  enqueue,
+
+
+ +
+
+ +
+
+ + + + + + + + + + + - - + + + + + - - + +
#define DMXDBG3(f,
a,
dmxCheckSpecialProcPtr  checkspecial, b,
c  )  DMXBlockType  block
+
+
+ +
+
+ +
+
+ + + + + + + + + + + - - + + + + + + + + + + + + + + +
#define DMXDBG4(f,
a,
) b,
c,
d  ) 
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG5(f,
a,
b,
c,
d,
e  ) 
-
- - - - - -
-   - - -

-Collect all pending events from the console's display. Plase these events on the server event queue using the motion and enqueue routines. The checkspecial routine is used to check for special keys that need handling. block tells if signals should be blocked when updating the event queue.

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
pointer dmxConsoleCreatePrivate ( DeviceIntPtr  pDevice  ) #define DMXDBG6(f,
a,
b,
c,
d,
e,
g  ) 
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG7(f,
a,
b,
c,
d,
e,
g,
h  ) 
-
- - - - - -
-   - - -

-Create the private area for pDevice.

-

- - - - -
- + +
+ +
+ +

Typedef Documentation

+ +
+
+
- - - - - - + +
void dmxConsoleDestroyPrivate ( pointer  private  ) typedef struct _myPrivate myPrivate
+ +
+
+ +

Function Documentation

+ +
+
+ + + + + + + + +
static void dmxCloseConsole (myPrivate *  priv )  [static]
-
- - - - - -
-   - - -

-If private is non-NULL, free its associated memory.

-

- - - - -
- + +
+ +

References _DMXInputInfo::console, dmxCommonRestoreState(), _myPrivate::dmxInput, _myPrivate::gc, _myPrivate::gcCur, _myPrivate::gcDet, _myPrivate::gcRev, and GETDMXINPUTFROMPRIV.

+ +

Referenced by dmxCloseConsoleScreen().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
int dmxConsoleFunctions ( pointer  private, static Bool dmxCloseConsoleScreen (int  idx,
ScreenPtr  pScreen 
DMXFunctionType  function) [static]
+ +
+ +

References _myPrivate::CloseScreen, DMX_UNWRAP, dmxCloseConsole(), dmxScreenPrivateKey, and _myPrivate::next.

+ +

Referenced by dmxConsoleInit().

+ +
+ + +
+
+ + + + + + - - +
void dmxConsoleCapture (DMXInputInfo *  dmxInput )  ) 
+
+
+

This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.

+ +

References _myPrivate::captured, _myPrivate::curX, _myPrivate::curY, _DMXInputInfo::devs, DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, dmxConsoleUpdateFineCursor(), DMXDBG0, DMXDBG3, dmxDump(), dmxSync(), _DMXLocalInputInfo::extType, _myPrivate::fine, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::type.

+

Referenced by dmxBackendUpdatePosition().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxConsoleClearCursor (myPrivate *  priv,
int  x,
int  y,
XRectangle *  rect 
) [static]
-
- - - - - -
-   - - -

-Handle special console-only keys.

-

- - - - -
- + +
+ +

References dmxConsoleDraw(), _myPrivate::gc, _myPrivate::gcDet, _myPrivate::gcRev, scalex(), and scaley().

+ +

Referenced by dmxConsoleFunctions(), and dmxConsoleUpdateFineCursor().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + +
void dmxConsoleCollectEvents (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
void dmxConsoleInit ( DevicePtr  pDev  ) )
+ +
+

Collect all pending events from the console's display. Plase these events on the server event queue using the motion and enqueue routines. The checkspecial routine is used to check for special keys that need handling. block tells if signals should be blocked when updating the event queue.

+

References dmxCommonRestoreState(), dmxCommonSaveState(), dmxConsoleDraw(), dmxConsoleMoveAbsolute(), dmxConsoleMoveRelative(), dmxConsoleUncapture(), DMXDBG2, DMXDBG4, DMXDBG5, DMXDBG6, _myPrivate::dmxInput, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _myPrivate::height, and _myPrivate::width.

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxConsoleComputeWidthHeight (myPrivate *  priv,
int *  width,
int *  height,
double *  xScale,
double *  yScale,
int *  consWidth,
int *  consHeight 
) [static]
-
- - - - - -
-   - - -

-Initialized the console device described by pDev.

-

- - - - -
- + +
+ +

References CONSOLE_DEN, CONSOLE_NUM, dmxGlobalHeight, dmxGlobalWidth, dmxNumScreens, scalex(), and scaley().

+ +

Referenced by dmxConsoleInit(), and dmxConsoleReInit().

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxConsoleKbdGetInfo ( DevicePtr  pDev, static Cursor dmxConsoleCreateEmptyCursor (myPrivate *  priv )  [static]
+ +
+ +

References dmxFatal, dmxLog(), and _myPrivate::pixmap.

+ +

Referenced by dmxConsoleInit().

+ +
+ + +
+
+ + + + + + + +
pointer dmxConsoleCreatePrivate (DeviceIntPtr  pDevice ) 
+
+
+

Create the private area for pDevice.

+ +

References GETDMXLOCALFROMPDEVICE.

+ +
+
+ +
+
+ + + + + + + - - +
void dmxConsoleDestroyPrivate (pointer  private )  DMXLocalInitInfoPtr  info
+
+
+

If private is non-NULL, free its associated memory.

+ +
+
+ +
+
+ + + + + + + + - - + + + + + + + + + + + + + +
static void dmxConsoleDraw (myPrivate *  priv,
) int  updateCursor,
int  update 
) [static]
+
+
+

References _DMXScreenInfo::beDisplay, _myPrivate::consHeight, _myPrivate::consWidth, dmxConsoleDrawFineCursor(), dmxConsoleDrawWindows(), _myPrivate::dmxInput, dmxNumScreens, dmxScreens, _myPrivate::fine, _myPrivate::gc, _myPrivate::gcDet, _myPrivate::gcRev, GETDMXINPUTFROMPRIV, _myPrivate::height, _myPrivate::pixmap, scalex(), scaley(), _myPrivate::width, and _DMXInputInfo::windows.

+ +

Referenced by dmxConsoleClearCursor(), dmxConsoleCollectEvents(), dmxConsoleInit(), dmxConsoleReInit(), dmxConsoleUpdateInfo(), and dmxConsoleUpdatePosition().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static void dmxConsoleDrawFineCursor (myPrivate *  priv,
XRectangle *  rect 
) [static]
-
- - - - - -
-   - - -

-Fill in the info structure for the specified pDev. Only used for keyboard.

-

- - - - -
- + +
+ +

References _myPrivate::gcCur, _myPrivate::globalX, _myPrivate::globalY, _myPrivate::grabbed, _myPrivate::pixmap, scalex(), and scaley().

+ +

Referenced by dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxConsoleMouGetInfo ( DevicePtr  pDev, static void dmxConsoleDrawWindows (pointer  private )  [static]
+ +
+ +

References dmxDebug, dmxLog(), dmxNumScreens, GETONLYPRIVFROMPRIVATE, scalex(), and scaley().

+ +

Referenced by dmxConsoleDraw().

+ +
+ + +
+
+ + + + + + + + + + + + - - + + +
int dmxConsoleFunctions (pointer  private,
DMXFunctionType  function 
DMXLocalInitInfoPtr  info)
+
+
+

Handle special console-only keys.

+ +

References DMX_FUNCTION_FINE, DMX_FUNCTION_GRAB, DMX_FUNCTION_TERMINATE, dmxConsoleClearCursor(), dmxConsoleUpdateFineCursor(), dmxError, dmxLog(), GETONLYPRIVFROMPRIVATE, scalex(), and scaley().

+ +
+
+ +
+
+ + + + + + - - +
void dmxConsoleInit (DevicePtr  pDev )  ) 
+
+
+

Initialized the console device described by pDev.

+ +

References _myPrivate::CloseScreen, CONSOLE_BG_COLOR, CONSOLE_SCREEN_BG_COLOR, CONSOLE_SCREEN_CUR_COLOR, CONSOLE_SCREEN_DET_COLOR, CONSOLE_SCREEN_FG_COLOR, DMX_CONSOLE_NAME, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, DMX_RES_CLASS, DMX_RES_NAME, DMX_WRAP, dmxCloseConsoleScreen(), dmxConsoleComputeWidthHeight(), dmxConsoleCreateEmptyCursor(), dmxConsoleDraw(), dmxFatal, _myPrivate::dmxInput, dmxInputs, dmxLog(), dmxScreenPrivateKey, GETPRIVFROMPDEV, _myPrivate::mask, _DMXInputInfo::name, scalex(), and scaley().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + +
void dmxConsoleKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
-
- - - - - -
-   - - -

-Fill in the info structure for the specified pDev. Only used for pointers.

-

- - - - -
- + +
+

Fill in the info structure for the specified pDev. Only used for keyboard.

+ +

References dmxCommonKbdGetInfo(), dmxCommonKbdGetMap(), _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + +
void dmxConsoleMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
+ +
+

Fill in the info structure for the specified pDev. Only used for pointers.

+ +

References _DMXLocalInitInfo::buttonClass, dmxCommonMouGetMap(), GETPRIVFROMPDEV, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + +
static void dmxConsoleMoveAbsolute (myPrivate *  priv,
int  x,
int  y,
DevicePtr  pDev,
dmxMotionProcPtr  motion,
void dmxConsoleReInit ( DevicePtr  pDev  ) DMXBlockType  block 
) [static]
+
+
+ +

References _myPrivate::curX, _myPrivate::curY, DMX_ABSOLUTE_CONFINED, DMXDBG6, unscalex(), and unscaley().

+ +

Referenced by dmxConsoleCollectEvents().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxConsoleMoveRelative (myPrivate *  priv,
int  x,
int  y,
DevicePtr  pDev,
dmxMotionProcPtr  motion,
DMXBlockType  block 
) [static]
-
- - - - - -
-   - - -

-Re-initialized the console device described by pDev (after a reconfig).

-

- - - - -
- + +
+ +

References DMX_RELATIVE, _myPrivate::lastX, and _myPrivate::lastY.

+ +

Referenced by dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxConsoleUncapture ( DMXInputInfo *  dmxInput  ) void dmxConsoleReInit (DevicePtr  pDev ) 
+ +
+

Re-initialized the console device described by pDev (after a reconfig).

+

References dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+ + + + + + + + +
void dmxConsoleUncapture (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Undo the capture that was done by dmxConsoleCapture.

-

- - - - -
- + +
+

Undo the capture that was done by dmxConsoleCapture.

+ +

References _myPrivate::captured, _DMXInputInfo::devs, DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, DMXDBG0, dmxSync(), _DMXLocalInputInfo::extType, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxBackendUpdatePosition(), and dmxConsoleCollectEvents().

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxConsoleUpdateInfo ( pointer  private, static void dmxConsoleUpdateFineCursor (myPrivate *  priv )  [static]
+ +
+ +

References _myPrivate::consHeight, _myPrivate::consWidth, dmxConsoleClearCursor(), dmxConsoleDrawFineCursor(), DMXDBG2, DMXDBG4, DMXDBG6, dmxEventName(), dmxGetGlobalPosition(), dmxInfo, dmxLog(), _myPrivate::gc, _myPrivate::globalX, _myPrivate::globalY, _myPrivate::height, _myPrivate::lastX, _myPrivate::lastY, _myPrivate::pixmap, scalex(), scaley(), and _myPrivate::width.

+ +

Referenced by dmxConsoleCapture(), dmxConsoleFunctions(), and dmxConsoleUpdatePosition().

+ +
+ + +
+
+ + + + + + + + + + + + + - - + + + + + +
void dmxConsoleUpdateInfo (pointer  private,
DMXUpdateType  type,
DMXUpdateType  type, WindowPtr  pWindow 
)
+
+
+

Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the pWindow that changed and the type of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.

+ +

References dmxConsoleDraw(), and GETONLYPRIVFROMPRIVATE.

+ +
+
+ +
+
+ + + + + + + + + - - + + + - - + + + + + + + +
void dmxConsoleUpdatePosition (pointer  private,
WindowPtr  pWindowint  x,
) int  y 
)
+
+
+

This routine gets called from dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.

+ +

References dmxConsoleDraw(), dmxConsoleUpdateFineCursor(), DMXDBG2, DMXDBG6, dmxGeneration, GETONLYPRIVFROMPRIVATE, scalex(), and scaley().

+
+
+ +
+
+ + + + + + + + +
static void dmxDump (void  )  [static]
-
- - - - - -
-   - - -

-Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the pWindow that changed and the type of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.

-

- - - - -
- + +
+ +

References _DMXInputInfo::devs, DMXDBG4, dmxEventName(), _myPrivate::dmxInput, dmxInputs, dmxNumInputs, _DMXInputInfo::name, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::private.

+ +

Referenced by dmxConsoleCapture().

+ +
+ + +
+
+
- - - - + + + + + + + + + + + + + +
void dmxConsoleUpdatePosition ( pointer  private, static int scalex (myPrivate *  priv,
int  x 
) [static]
+ +
+ +

References _myPrivate::xScale.

+ +

Referenced by dmxConsoleClearCursor(), dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), dmxConsoleDrawFineCursor(), dmxConsoleDrawWindows(), dmxConsoleFunctions(), dmxConsoleInit(), dmxConsoleUpdateFineCursor(), and dmxConsoleUpdatePosition().

+ +
+ + +
+
+ + + + + + + + + - - + + + + + +
static int scaley (myPrivate *  priv,
int  x, int  y 
) [static]
+
+
+ +

References _myPrivate::yScale.

+ +

Referenced by dmxConsoleClearCursor(), dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), dmxConsoleDrawFineCursor(), dmxConsoleDrawWindows(), dmxConsoleFunctions(), dmxConsoleInit(), dmxConsoleUpdateFineCursor(), and dmxConsoleUpdatePosition().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static int unscalex (myPrivate *  priv,
int  yint  x 
) ) [static]
+
+
+ +

References _myPrivate::xScale.

+ +

Referenced by dmxConsoleMoveAbsolute().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static int unscaley (myPrivate *  priv,
int  y 
) [static]
-
- - - - - -
-   - - -

-This routine gets called from #dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.

+

+
+ +

References _myPrivate::yScale.

+ +

Referenced by dmxConsoleMoveAbsolute().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html deleted file mode 100644 index b806b86fc..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxconsole.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXCONSOLE_H_
-00039 #define _DMXCONSOLE_H_
-00040 
-00041 extern pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice);
-00042 extern void    dmxConsoleDestroyPrivate(pointer private);
-00043 extern void    dmxConsoleInit(DevicePtr pDev);
-00044 extern void    dmxConsoleReInit(DevicePtr pDev);
-00045 extern void    dmxConsoleMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00046 extern void    dmxConsoleKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00047 extern void    dmxConsoleCollectEvents(DevicePtr pDev,
-00048                                        dmxMotionProcPtr motion,
-00049                                        dmxEnqueueProcPtr enqueue,
-00050                                        dmxCheckSpecialProcPtr checkspecial,
-00051                                        DMXBlockType block);
-00052 extern int     dmxConsoleFunctions(pointer private, DMXFunctionType function);
-00053 extern void    dmxConsoleUpdatePosition(pointer private, int x, int y);
-00054 extern void    dmxConsoleKbdSetCtrl(pointer private, KeybdCtrl *ctrl);
-00055 extern void    dmxConsoleCapture(DMXInputInfo *dmxInput);
-00056 extern void    dmxConsoleUncapture(DMXInputInfo *dmxInput);
-00057 extern void    dmxConsoleUpdateInfo(pointer private,
-00058                                     DMXUpdateType, WindowPtr pWindow);
-00059 
-00060 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html index 398f56a16..5baa40b29 100644 --- a/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html @@ -6,474 +6,413 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxconsole.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer dmxConsoleCreatePrivate (DeviceIntPtr pDevice)
void dmxConsoleDestroyPrivate (pointer private)
void dmxConsoleInit (DevicePtr pDev)
void dmxConsoleReInit (DevicePtr pDev)
void dmxConsoleMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxConsoleKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxConsoleCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
int dmxConsoleFunctions (pointer private, DMXFunctionType function)
void dmxConsoleUpdatePosition (pointer private, int x, int y)
void dmxConsoleCapture (DMXInputInfo *dmxInput)
void dmxConsoleUncapture (DMXInputInfo *dmxInput)
void dmxConsoleUpdateInfo (pointer private, DMXUpdateType, WindowPtr pWindow)
+ + + + + + + + + + + + + +

Functions

pointer dmxConsoleCreatePrivate (DeviceIntPtr pDevice)
void dmxConsoleDestroyPrivate (pointer private)
void dmxConsoleInit (DevicePtr pDev)
void dmxConsoleReInit (DevicePtr pDev)
void dmxConsoleMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxConsoleKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxConsoleCollectEvents (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
int dmxConsoleFunctions (pointer private, DMXFunctionType function)
void dmxConsoleUpdatePosition (pointer private, int x, int y)
void dmxConsoleKbdSetCtrl (pointer private, KeybdCtrl *ctrl)
void dmxConsoleCapture (DMXInputInfo *dmxInput)
void dmxConsoleUncapture (DMXInputInfo *dmxInput)
void dmxConsoleUpdateInfo (pointer private, DMXUpdateType, WindowPtr pWindow)
-

Detailed Description

-Interface for console device support.
See also:
dmxconsole.c

-dmxcommon.c

-

Function Documentation

-

- - - - -
- - - - - - - - +

Detailed Description

+

Interface for console device support.

+
See also:
dmxconsole.c
+
+dmxcommon.c
+

Function Documentation

+ +
+
+
void dmxConsoleCapture ( DMXInputInfo *  dmxInput  ) 
+ + + + + + + -
void dmxConsoleCapture (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - + +
+

This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.

-

-This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.

-

- - - - -
- +

References _myPrivate::captured, _myPrivate::curX, _myPrivate::curY, _DMXInputInfo::devs, DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, dmxConsoleUpdateFineCursor(), DMXDBG0, DMXDBG3, dmxDump(), dmxSync(), _DMXLocalInputInfo::extType, _myPrivate::fine, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxBackendUpdatePosition().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxConsoleCollectEvents ( DevicePtr  pDev, void dmxConsoleCollectEvents (DevicePtr  pDev,
dmxMotionProcPtr  motion, dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue, dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial, dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  blockDMXBlockType  block 
) )
-
- - - - - -
-   - - -

-Collect all pending events from the console's display. Plase these events on the server event queue using the motion and enqueue routines. The checkspecial routine is used to check for special keys that need handling. block tells if signals should be blocked when updating the event queue.

-

- - - - -
- - - - - - - - + +
+

Collect all pending events from the console's display. Plase these events on the server event queue using the motion and enqueue routines. The checkspecial routine is used to check for special keys that need handling. block tells if signals should be blocked when updating the event queue.

+ +

References dmxCommonRestoreState(), dmxCommonSaveState(), dmxConsoleDraw(), dmxConsoleMoveAbsolute(), dmxConsoleMoveRelative(), dmxConsoleUncapture(), DMXDBG2, DMXDBG4, DMXDBG5, DMXDBG6, _myPrivate::dmxInput, GETDMXINPUTFROMPRIV, GETPRIVFROMPDEV, _myPrivate::height, and _myPrivate::width.

+ +
+ + +
+
+
pointer dmxConsoleCreatePrivate ( DeviceIntPtr  pDevice  ) 
+ + + + + + + -
pointer dmxConsoleCreatePrivate (DeviceIntPtr  pDevice ) 
-
- - - - - -
-   - - -

-Create the private area for pDevice.

-

- - - - -
- - - - - - - - + +
+

Create the private area for pDevice.

+ +

References GETDMXLOCALFROMPDEVICE.

+ +
+ + +
+
+
void dmxConsoleDestroyPrivate ( pointer  private  ) 
+ + + + + + + -
void dmxConsoleDestroyPrivate (pointer  private ) 
-
- - - - - -
-   - - -

-If private is non-NULL, free its associated memory.

-

- - - - -
- + +
+

If private is non-NULL, free its associated memory.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxConsoleFunctions ( pointer  private, int dmxConsoleFunctions (pointer  private,
DMXFunctionType  functionDMXFunctionType  function 
) )
-
- - - - - -
-   - - -

-Handle special console-only keys.

-

- - - - -
- - - - - - - - + +
+

Handle special console-only keys.

+ +

References DMX_FUNCTION_FINE, DMX_FUNCTION_GRAB, DMX_FUNCTION_TERMINATE, dmxConsoleClearCursor(), dmxConsoleUpdateFineCursor(), dmxError, dmxLog(), GETONLYPRIVFROMPRIVATE, scalex(), and scaley().

+ +
+ + +
+
+
void dmxConsoleInit ( DevicePtr  pDev  ) 
+ + + + + + + -
void dmxConsoleInit (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Initialized the console device described by pDev.

-

- - - - -
- + +
+

Initialized the console device described by pDev.

+ +

References _myPrivate::CloseScreen, CONSOLE_BG_COLOR, CONSOLE_SCREEN_BG_COLOR, CONSOLE_SCREEN_CUR_COLOR, CONSOLE_SCREEN_DET_COLOR, CONSOLE_SCREEN_FG_COLOR, DMX_CONSOLE_NAME, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, DMX_RES_CLASS, DMX_RES_NAME, DMX_WRAP, dmxCloseConsoleScreen(), dmxConsoleComputeWidthHeight(), dmxConsoleCreateEmptyCursor(), dmxConsoleDraw(), dmxFatal, _myPrivate::dmxInput, dmxInputs, dmxLog(), dmxScreenPrivateKey, GETPRIVFROMPDEV, _myPrivate::mask, _DMXInputInfo::name, scalex(), and scaley().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + + +
void dmxConsoleKbdGetInfo ( DevicePtr  pDev, void dmxConsoleKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
DMXLocalInitInfoPtr  info)
+ +
+

Fill in the info structure for the specified pDev. Only used for keyboard.

+ +

References dmxCommonKbdGetInfo(), dmxCommonKbdGetMap(), _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+ +
+ + +
+
+ + + + + + + - - + + + + + + + -
void dmxConsoleKbdSetCtrl (pointer  private,
) KeybdCtrl *  ctrl 
)
-
- - - - - -
-   - - -

-Fill in the info structure for the specified pDev. Only used for keyboard.

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
void dmxConsoleMouGetInfo ( DevicePtr  pDev, void dmxConsoleMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
DMXLocalInitInfoPtr  info)
+ +
+

Fill in the info structure for the specified pDev. Only used for pointers.

+ +

References _DMXLocalInitInfo::buttonClass, dmxCommonMouGetMap(), GETPRIVFROMPDEV, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + - - -
void dmxConsoleReInit (DevicePtr  pDev )  ) 
-
- - - - - -
-   - - -

-Fill in the info structure for the specified pDev. Only used for pointers.

-

- - - - -
- - - - - - - - + +
+

Re-initialized the console device described by pDev (after a reconfig).

+ +

References dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), and GETPRIVFROMPDEV.

+ +
+ + +
+
+
void dmxConsoleReInit ( DevicePtr  pDev  ) 
+ + + + + + + -
void dmxConsoleUncapture (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - + +
+

Undo the capture that was done by dmxConsoleCapture.

-

-Re-initialized the console device described by pDev (after a reconfig).

-

- - - - -
- - - - - - - - - +

References _myPrivate::captured, _DMXInputInfo::devs, DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, DMXDBG0, dmxSync(), _DMXLocalInputInfo::extType, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::type.

-
void dmxConsoleUncapture ( DMXInputInfo *  dmxInput  ) 
-
- - - - - -
-   - +

Referenced by dmxBackendUpdatePosition(), and dmxConsoleCollectEvents().

-

-Undo the capture that was done by dmxConsoleCapture.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxConsoleUpdateInfo ( pointer  private, void dmxConsoleUpdateInfo (pointer  private,
DMXUpdateType  type, DMXUpdateType  type,
WindowPtr  pWindowWindowPtr  pWindow 
) )
-
- - - - - -
-   - - -

-Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the pWindow that changed and the type of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.

-

- - - - -
- + +
+

Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the pWindow that changed and the type of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.

+ +

References dmxConsoleDraw(), and GETONLYPRIVFROMPRIVATE.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxConsoleUpdatePosition ( pointer  private, void dmxConsoleUpdatePosition (pointer  private,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - + +
+

This routine gets called from dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.

-

-This routine gets called from #dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.

+

References dmxConsoleDraw(), dmxConsoleUpdateFineCursor(), DMXDBG2, DMXDBG6, dmxGeneration, GETONLYPRIVFROMPRIVATE, scalex(), and scaley().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html new file mode 100644 index 000000000..1f3f4e911 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html @@ -0,0 +1,92 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html index 744bc3547..f6abb7f83 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html @@ -6,457 +6,1444 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcursor.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxcursor.h"
-#include "dmxlog.h"
-#include "dmxprop.h"
-#include "dmxinput.h"
-#include "mipointer.h"
-#include "windowstr.h"
-#include "globals.h"
-#include "cursorstr.h"
-#include "dixevents.h"
- - - - + + +
+

dmxcursor.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxcursor.h"
+#include "dmxlog.h"
+#include "dmxprop.h"
+#include "dmxinput.h"
+#include "mipointer.h"
+#include "windowstr.h"
+#include "globals.h"
+#include "cursorstr.h"
+#include "dixevents.h"
+#include "inputstr.h"
+

Functions

void dmxCursorNoMulti (void)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_CURSOR_DEBUG   0
#define DMXDBG0(f)
#define DMXDBG1(f, a)
#define DMXDBG2(f, a, b)
#define DMXDBG3(f, a, b, c)
#define DMXDBG4(f, a, b, c, d)
#define DMXDBG5(f, a, b, c, d, e)
#define DMXDBG6(f, a, b, c, d, e, g)
#define DMXDBG7(f, a, b, c, d, e, g, h)

Functions

void dmxCursorNoMulti (void)
static Bool dmxCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y)
static void dmxCrossScreen (ScreenPtr pScreen, Bool entering)
static void dmxWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
static int * dmxSLCreate (void)
static void dmxSLFree (int *list)
static int dmxSLFindNext (int *list)
static int dmxTryComputeScreenOrigins (int *screensLeft)
static void dmxComputeScreenOrigins (void)
void dmxReInitOrigins (void)
void dmxInitOrigins (void)
int dmxOnScreen (int x, int y, DMXScreenInfo *dmxScreen)
static int dmxDoesOverlap (DMXScreenInfo *a, DMXScreenInfo *b)
static void * dmxPrintOverlap (DMXScreenInfo *dmxScreen, void *closure)
static void * dmxIterateOverlap (DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *), void *closure)
static void * dmxTestSameDisplay (DMXScreenInfo *a, void *closure)
void dmxInitOverlap (void)
void dmxBECreateCursor (ScreenPtr pScreen, CursorPtr pCursor)
static Bool _dmxRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
Bool dmxBEFreeCursor (ScreenPtr pScreen, CursorPtr pCursor)
static Bool _dmxUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
static void _dmxMoveCursor (ScreenPtr pScreen, int x, int y)
static void _dmxSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
static Bool dmxRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
static Bool dmxUnrealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
static CursorPtr dmxFindCursor (DMXScreenInfo *start)
void dmxMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
static void dmxSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
void dmxHideCursor (DMXScreenInfo *dmxScreen)
void dmxCheckCursor (void)
static Bool dmxDeviceCursorInitialize (DeviceIntPtr pDev, ScreenPtr pScr)
static void dmxDeviceCursorCleanup (DeviceIntPtr pDev, ScreenPtr pScr)

Variables

static int dmxCursorDoMultiCursors = 1
miPointerScreenFuncRec dmxPointerCursorFuncs
miPointerSpriteFuncRec dmxPointerSpriteFuncs
+

Detailed Description

+

This file contains code than supports cursor movement, including the code that initializes and reinitializes the screen positions and computes screen overlap.

+

"This code is based very closely on the XFree86 equivalent + (xfree86/common/xf86Cursor.c)." --David Dawes.

+

"This code was then extensively re-written, as explained here." --Rik Faith

+

The code in xf86Cursor.c used edge lists to implement the CursorOffScreen function. The edge list computation was complex (especially in the face of arbitrarily overlapping screens) compared with the speed savings in the CursorOffScreen function. The new implementation has erred on the side of correctness, readability, and maintainability over efficiency. For the common (non-edge) case, the dmxCursorOffScreen function does avoid a loop over all the screens. When the cursor has left the screen, all the screens are searched, and the first screen (in dmxScreens order) containing the cursor will be returned. If run-time profiling shows that this routing is a performance bottle-neck, then an edge list may have to be reimplemented. An edge list algorithm is O(edges) whereas the new algorithm is O(dmxNumScreens). Since edges is usually 1-3 and dmxNumScreens may be 30-60 for large backend walls, this trade off may be compelling.

+

The xf86InitOrigins routine uses bit masks during the computation and is therefore limited to the length of a word (e.g., 32 or 64 bits) screens. Because Xdmx is expected to be used with a large number of backend displays, this limitation was removed. The new implementation has erred on the side of readability over efficiency, using the dmxSL* routines to manage a screen list instead of a bitmap, and a function call to decrease the length of the main routine. Both algorithms are of the same order, and both are called only at server generation time, so trading clarity and long-term maintainability for efficiency does not seem justified in this case.

+

Define Documentation

+ +
+
+ + + + +
#define DMX_CURSOR_DEBUG   0
+
+
-void dmxReInitOrigins (void) +
+
+ +
+
+ + + + + + + + + +
#define DMXDBG0(f  ) 
+
+
-void dmxInitOrigins (void) +

Referenced by dmxBackendUpdatePosition(), dmxCommonRestoreState(), dmxCommonSaveState(), dmxConsoleCapture(), and dmxConsoleUncapture().

-int dmxOnScreen (int x, int y, DMXScreenInfo *dmxScreen) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define DMXDBG1(f,
a  ) 
+
+
-void dmxInitOverlap (void) +

Referenced by dmxBackendLateReInit().

-void dmxBECreateCursor (ScreenPtr pScreen, CursorPtr pCursor) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define DMXDBG2(f,
a,
b  ) 
+
+
-Bool dmxBEFreeCursor (ScreenPtr pScreen, CursorPtr pCursor) +

Referenced by _dmxRealizeCursor(), _dmxUnrealizeCursor(), dmxBackendCollectEvents(), dmxBackendUpdatePosition(), dmxCheckCursor(), dmxCheckSpecialKeys(), dmxConsoleCollectEvents(), dmxConsoleUpdateFineCursor(), dmxConsoleUpdatePosition(), dmxEnqueue(), and dmxKeyCodeToKeySym().

-void dmxMoveCursor (ScreenPtr pScreen, int x, int y) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG3(f,
a,
b,
c  ) 
+
+
-void dmxHideCursor (DMXScreenInfo *dmxScreen) +

Referenced by dmxCheckFunctionKeys(), dmxConsoleCapture(), dmxKeySymToKeyCode(), dmxMoveCursor(), and dmxWarpCursor().

-void dmxCheckCursor (void) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG4(f,
a,
b,
c,
d  ) 
+
+
-

Variables

-miPointerScreenFuncRec dmxPointerCursorFuncs +

Referenced by _dmxSetCursor(), dmxBackendCollectEvents(), dmxBackendProcessInput(), dmxConsoleCollectEvents(), dmxConsoleUpdateFineCursor(), dmxCoreMotion(), and dmxDump().

-miPointerSpriteFuncRec dmxPointerSpriteFuncs +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG5(f,
a,
b,
c,
d,
e  ) 
+
+
- -

Detailed Description

-This file contains code than supports cursor movement, including the code that initializes and reinitializes the screen positions and computes screen overlap.

-"This code is based very closely on the XFree86 equivalent (xfree86/common/xf86Cursor.c)." --David Dawes.

-"This code was then extensively re-written, as explained here." --Rik Faith

-The code in xf86Cursor.c used edge lists to implement the CursorOffScreen function. The edge list computation was complex (especially in the face of arbitrarily overlapping screens) compared with the speed savings in the CursorOffScreen function. The new implementation has erred on the side of correctness, readability, and maintainability over efficiency. For the common (non-edge) case, the dmxCursorOffScreen function does avoid a loop over all the screens. When the cursor has left the screen, all the screens are searched, and the first screen (in dmxScreens order) containing the cursor will be returned. If run-time profiling shows that this routing is a performance bottle-neck, then an edge list may have to be reimplemented. An edge list algorithm is O(edges) whereas the new algorithm is O(dmxNumScreens). Since edges is usually 1-3 and dmxNumScreens may be 30-60 for large backend walls, this trade off may be compelling.

-The xf86InitOrigins routine uses bit masks during the computation and is therefore limited to the length of a word (e.g., 32 or 64 bits) screens. Because Xdmx is expected to be used with a large number of backend displays, this limitation was removed. The new implementation has erred on the side of readability over efficiency, using the dmxSL* routines to manage a screen list instead of a bitmap, and a function call to decrease the length of the main routine. Both algorithms are of the same order, and both are called only at server generation time, so trading clarity and long-term maintainability for efficiency does not seem justified in this case.

Function Documentation

-

- - - - -
- +

Referenced by _dmxMoveCursor(), dmxBackendCollectEvents(), dmxBackendUpdatePosition(), dmxConsoleCollectEvents(), dmxCoreMotion(), and dmxSetCursor().

+ + + + +
+
+
+ + + + + + + + + + + + + + + - - - - + + + + + + + + - - + + + + + + - - +
#define DMXDBG6(f,
a,
b,
void dmxBECreateCursor ( ScreenPtr  pScreen, c,
d,
CursorPtr  pCursore,
g  )  ) 
+ +
+ +

Referenced by dmxBackendProcessInput(), dmxConsoleCollectEvents(), dmxConsoleMoveAbsolute(), dmxConsoleUpdateFineCursor(), dmxConsoleUpdatePosition(), dmxCoreMotion(), and dmxInitOverlap().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG7(f,
a,
b,
c,
d,
e,
g,
h  ) 
-
- - - - - -
-   - - -

-Create pCursor on the back-end associated with pScreen.

-

- - - - -
- + +
+ +

Referenced by dmxBackendCollectEvents().

+ +
+ +

Function Documentation

+ +
+
+
- - - - + + + + + + + + + + - - + + - - + + +
Bool dmxBEFreeCursor ( ScreenPtr  pScreen, static void _dmxMoveCursor (ScreenPtr  pScreen,
int  x,
CursorPtr  pCursorint  y 
) ) [static]
+ +
+

References _DMXScreenInfo::beDisplay, DMXDBG5, dmxScreens, dmxSync(), _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, and _DMXScreenInfo::scrnWin.

+ +

Referenced by _dmxSetCursor(), and dmxMoveCursor().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
static Bool _dmxRealizeCursor (ScreenPtr  pScreen,
CursorPtr  pCursor 
) [static]
-
- - - - - -
-   - - -

-Free pCursor on the back-end associated with pScreen.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, _dmxCursorPriv::cursor, DMX_GET_CURSOR_PRIV, DMX_SET_CURSOR_PRIV, dmxBECreateCursor(), DMXDBG2, and dmxScreens.

+ +

Referenced by dmxCheckCursor(), dmxMoveCursor(), and dmxRealizeCursor().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + +
static void _dmxSetCursor (ScreenPtr  pScreen,
CursorPtr  pCursor,
int  x,
void dmxCheckCursor ( void   ) int  y 
) [static]
+ +
+ +

References _dmxMoveCursor(), _DMXScreenInfo::beDisplay, _DMXScreenInfo::curCursor, _DMXScreenInfo::cursor, _dmxCursorPriv::cursor, _DMXScreenInfo::cursorVisible, DMX_GET_CURSOR_PRIV, DMXDBG4, dmxScreens, dmxSync(), _DMXScreenInfo::noCursor, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxCheckCursor(), dmxHideCursor(), dmxMoveCursor(), and dmxSetCursor().

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
static Bool _dmxUnrealizeCursor (ScreenPtr  pScreen,
CursorPtr  pCursor 
) [static]
-
- - - - - -
-   - - -

-This routine is called during reconfiguration to make sure the cursor is visible.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, DMX_GET_CURSOR_PRIV, DMX_SET_CURSOR_PRIV, dmxBEFreeCursor(), DMXDBG2, and dmxScreens.

+ +

Referenced by dmxUnrealizeCursor().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + +
void dmxCursorNoMulti ( void   ) void dmxBECreateCursor (ScreenPtr  pScreen,
CursorPtr  pCursor 
)
+ +
+

Create pCursor on the back-end associated with pScreen.

+

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, _dmxCursorPriv::cursor, DMX_GET_CURSOR_PRIV, dmxFatal, dmxLog(), dmxScreens, dmxSync(), _myPrivate::gc, _DMXScreenInfo::scrnDefDrawables, and _DMXScreenInfo::scrnWin.

+ +

Referenced by _dmxRealizeCursor(), and dmxBECreateResources().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
Bool dmxBEFreeCursor (ScreenPtr  pScreen,
CursorPtr  pCursor 
)
-
- - - - - -
-   - - -

-Turn off support for displaying multiple cursors on overlapped back-end displays. See #dmxCursorDoMultiCursors.

-

- - - - -
- + +
+

Free pCursor on the back-end associated with pScreen.

+ +

References _DMXScreenInfo::beDisplay, _dmxCursorPriv::cursor, DMX_GET_CURSOR_PRIV, and dmxScreens.

+ +

Referenced by _dmxUnrealizeCursor(), and dmxBEDestroyResources().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxHideCursor ( DMXScreenInfo *  dmxScreen  ) void dmxCheckCursor (void  ) 
+ +
+

This routine is called during reconfiguration to make sure the cursor is visible.

+

References _dmxRealizeCursor(), _dmxSetCursor(), _DMXScreenInfo::cursor, DMXDBG2, dmxFindCursor(), dmxFindFirstScreen(), dmxGetGlobalPosition(), dmxNumScreens, dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +

Referenced by dmxAdjustCursorBoundaries(), and dmxBackendUpdatePosition().

+ +
+ + +
+
+ + + + + + + + +
static void dmxComputeScreenOrigins (void  )  [static]
-
- - - - - -
-   - - -

-This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input.

See also:
dmxbackend.c
-
-

- - - - -
- + +
+ +

References dmxNumScreens, dmxScreens, dmxSLCreate(), dmxSLFindNext(), dmxSLFree(), dmxTryComputeScreenOrigins(), and _DMXScreenInfo::whereRefScreen.

+ +

Referenced by dmxInitOrigins().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
static void dmxCrossScreen (ScreenPtr  pScreen,
void dmxInitOrigins ( void   ) Bool  entering 
) [static]
+ +
+
+ + +
+
+ + + + + + + + +
void dmxCursorNoMulti (void  ) 
-
- - - - - -
-   - - -

-Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use dmxReInitOrigins() instead.

-

- - - - -
- + +
+

Turn off support for displaying multiple cursors on overlapped back-end displays. See dmxCursorDoMultiCursors.

+ +

References dmxCursorDoMultiCursors.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + +
static Bool dmxCursorOffScreen (ScreenPtr *  ppScreen,
int *  x,
int *  y 
void dmxInitOverlap ( void   ) ) [static]
+ +
+

References dmxNumScreens, dmxScreens, _myPrivate::globalX, _myPrivate::globalY, _DMXScreenInfo::index, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
static void dmxDeviceCursorCleanup (DeviceIntPtr  pDev,
ScreenPtr  pScr 
) [static]
-
- - - - - -
-   - - -

-Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + + +
void dmxMoveCursor ( ScreenPtr  pScreen, static Bool dmxDeviceCursorInitialize (DeviceIntPtr  pDev,
ScreenPtr  pScr 
int  x, ) [static]
+ +
+ +
+ + +
+
+ + + + + + + + + + + - - + + +
static int dmxDoesOverlap (DMXScreenInfo *  a,
DMXScreenInfo *  b 
int  y) [static]
+
+
+

Returns non-zero if a overlaps b.

+ +

References dmxOnScreen(), _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, and _DMXScreenInfo::scrnWidth.

+ +

Referenced by dmxInitOverlap().

+ +
+
+ +
+
+ + + + + + + + +
static CursorPtr dmxFindCursor (DMXScreenInfo *  start )  [static]
+
+
+ +

References _DMXScreenInfo::cursor, and _DMXScreenInfo::over.

+ +

Referenced by dmxCheckCursor(), and dmxMoveCursor().

+ +
+
+ +
+
+ + + + + + + - - +
void dmxHideCursor (DMXScreenInfo *  dmxScreen )  ) 
+
+
+

This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input.

+
See also:
dmxbackend.c
+

References _dmxSetCursor(), dmxGetGlobalPosition(), and _DMXScreenInfo::index.

+ +

Referenced by dmxBackendUpdatePosition().

+ +
+
+ +
+
+ + + + + + + + +
void dmxInitOrigins (void  ) 
-
- - - - - -
-   - - -

-Move the cursor to coordinates (x, y)on pScreen. This function is usually called via dmxPointerSpriteFuncs, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.

-

- - - - -
- + +
+

Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use dmxReInitOrigins() instead.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, dmxComputeScreenOrigins(), dmxFatal, dmxLog(), dmxLogOutput(), dmxNumScreens, dmxReInitOrigins(), dmxScreens, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _DMXScreenInfo::where, _DMXScreenInfo::whereX, and _DMXScreenInfo::whereY.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
- - - - + + + + + + + +
int dmxOnScreen ( int  x, void dmxInitOverlap (void  ) 
+ +
+

Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .

+ +

References _DMXScreenInfo::cursorNotShared, DMXDBG6, dmxDoesOverlap(), dmxInfo, dmxIterateOverlap(), dmxLog(), dmxLogOutput(), dmxLogOutputCont(), dmxNumScreens, dmxPrintOverlap(), dmxPropertyIterate(), dmxScreens, dmxTestSameDisplay(), _DMXScreenInfo::index, _DMXScreenInfo::name, and _DMXScreenInfo::over.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ +
+ + +
+
+ + + + + + + + + + + + - - + + + + + +
static void* dmxIterateOverlap (DMXScreenInfo *  start,
void *(*)(DMXScreenInfo *dmxScreen, void *)  f,
int  y, void *  closure 
) [static]
+
+
+

Iterate over the screens which overlap with the start screen, calling f with the closure for each argument. Often used with dmxPrintOverlap.

+ +

References _DMXScreenInfo::over.

+ +

Referenced by dmxInitOverlap().

+ +
+
+ +
+
+ + + + + + + + + - - + + + - - + + + + + + + + + + + + + +
void dmxMoveCursor (DeviceIntPtr  pDev,
DMXScreenInfo *  dmxScreenScreenPtr  pScreen,
) int  x,
int  y 
)
+
+
+

Move the cursor to coordinates (x, y)on pScreen. This function is usually called via dmxPointerSpriteFuncs, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.

+

The coords (x,y) are in global coord space. We'll loop over the back-end screens and see if they contain the global coord. If so, call _dmxMoveCursor() (XWarpPointer) to position the pointer on that screen.

+

References _dmxMoveCursor(), _dmxRealizeCursor(), _dmxSetCursor(), _DMXScreenInfo::cursor, _DMXScreenInfo::cursorNotShared, _DMXScreenInfo::cursorVisible, dmxCursorDoMultiCursors, DMXDBG3, dmxFindCursor(), dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _DMXScreenInfo::over, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
int dmxOnScreen (int  x,
int  y,
DMXScreenInfo *  dmxScreen 
)
-
- - - - - -
-   - - -

-Returns non-zero if the global x, y coordinate is on the screen window of the dmxScreen.

-

- - - - -
- + +
+

Returns non-zero if the global x, y coordinate is on the screen window of the dmxScreen.

+ +

References dmxDebug, dmxLog(), _DMXScreenInfo::index, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by dmxBackendFindOverlapping(), dmxBackendOffscreen(), dmxCheckCursor(), dmxDoesOverlap(), dmxFindFirstScreen(), dmxMoveCursor(), and dmxSetCursor().

+ +
+ + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
static void* dmxPrintOverlap (DMXScreenInfo *  dmxScreen,
void *  closure 
void dmxReInitOrigins ( void   ) ) [static]
+ +
+

Used with dmxInterateOverlap to print out a list of screens which overlap each other.

+

References _DMXScreenInfo::cursorNotShared, dmxLogOutputCont(), _DMXScreenInfo::index, and _DMXScreenInfo::name.

+ +

Referenced by dmxInitOverlap().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static Bool dmxRealizeCursor (DeviceIntPtr  pDev,
ScreenPtr  pScreen,
CursorPtr  pCursor 
) [static]
-
- - - - - -
-   - - -

-Recompute origin information in the dmxScreens list. This is either called from dmxInitOrigins() or from #dmxReconfig().

-

Variable Documentation

-

- - - - -
- + +
+ +

References _dmxRealizeCursor(), _DMXScreenInfo::cursorNotShared, dmxCursorDoMultiCursors, dmxScreens, _DMXScreenInfo::index, and _DMXScreenInfo::over.

+ +
+ + +
+
+
- + + + + + +
miPointerScreenFuncRec dmxPointerCursorFuncs + void dmxReInitOrigins (void  ) 
-
- - - - - -
-   - - -

-Initial value:

+
+
+

Recompute origin information in the dmxScreens list. This is called from dmxInitOrigins.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, dmxFatal, dmxLog(), dmxLogOutput(), dmxNumScreens, dmxScreens, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by dmxAdjustCursorBoundaries(), and dmxInitOrigins().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxSetCursor (DeviceIntPtr  pDev,
ScreenPtr  pScreen,
CursorPtr  pCursor,
int  x,
int  y 
) [static]
+
+
+ +

References _dmxSetCursor(), _DMXScreenInfo::cursorNotShared, DMX_NO_BLOCK, dmxCoreMotion(), dmxCursorDoMultiCursors, DMXDBG5, dmxGetGlobalPosition(), dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _DMXScreenInfo::over, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +
+
+ +
+
+ + + + + + + + + +
static int* dmxSLCreate (void  )  [static]
+
+
+

Create a list of screens that we'll manipulate.

+ +

References dmxNumScreens.

+ +

Referenced by dmxComputeScreenOrigins().

+ +
+
+ +
+
+ + + + + + + + + +
static int dmxSLFindNext (int *  list )  [static]
+
+
+

Find next uninitialized entry in list.

+ +

References dmxNumScreens.

+ +

Referenced by dmxComputeScreenOrigins().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxSLFree (int *  list )  [static]
+
+
+

Free list.

+ +

Referenced by dmxComputeScreenOrigins().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
static void* dmxTestSameDisplay (DMXScreenInfo *  a,
void *  closure 
) [static]
+
+
+

Used with dmxPropertyIterate to determine if screen a is the same as the screen closure.

+ +

Referenced by dmxInitOverlap().

+ +
+
+ +
+
+ + + + + + + + + +
static int dmxTryComputeScreenOrigins (int *  screensLeft )  [static]
+
+
+

Make one pass over all the screens and return the number updated.

+ +

References dmxFatal, dmxLog(), dmxNumScreens, dmxScreens, PosAbove, PosAbsolute, PosBelow, PosLeftOf, PosNone, PosRelative, PosRightOf, _DMXScreenInfo::where, _DMXScreenInfo::whereRefScreen, _DMXScreenInfo::whereX, and _DMXScreenInfo::whereY.

+ +

Referenced by dmxComputeScreenOrigins().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static Bool dmxUnrealizeCursor (DeviceIntPtr  pDev,
ScreenPtr  pScreen,
CursorPtr  pCursor 
) [static]
+
+
+ +

References _dmxUnrealizeCursor(), _DMXScreenInfo::cursorNotShared, dmxCursorDoMultiCursors, dmxScreens, _DMXScreenInfo::index, and _DMXScreenInfo::over.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxWarpCursor (DeviceIntPtr  pDev,
ScreenPtr  pScreen,
int  x,
int  y 
) [static]
+
+
+ +

References DMXDBG3.

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
int dmxCursorDoMultiCursors = 1 [static]
+
+
+ +

Referenced by dmxCursorNoMulti(), dmxMoveCursor(), dmxRealizeCursor(), dmxSetCursor(), and dmxUnrealizeCursor().

+ +
+
+ +
+
+ + + + +
miPointerScreenFuncRec dmxPointerCursorFuncs
+
+
+Initial value:
 {
-    dmxCursorOffScreen,
-    dmxCrossScreen,
-    dmxWarpCursor,
-    dmxeqEnqueue,
-    dmxeqSwitchScreen
+    dmxCursorOffScreen,
+    dmxCrossScreen,
+    dmxWarpCursor,
+    NULL,
+    NULL,
 }
-
Cursor functions for mi layer.
See also:
dmxcursor.c

+

Cursor functions for mi layer.

+
See also:
dmxcursor.c
+
dmxscrinit.c
-
-

- - - - -
- + +

Referenced by dmxScreenInit().

+ + + + +
+
+
- +
miPointerSpriteFuncRec dmxPointerSpriteFuncs + miPointerSpriteFuncRec dmxPointerSpriteFuncs
-
- - - - - -
-   - - -

-Initial value:

+
+
+Initial value:
 {
-    dmxRealizeCursor,
-    dmxUnrealizeCursor,
-    dmxSetCursor,
-    dmxMoveCursor,
+    dmxRealizeCursor,
+    dmxUnrealizeCursor,
+    dmxSetCursor,
+    dmxMoveCursor,
+    dmxDeviceCursorInitialize,
+    dmxDeviceCursorCleanup
 }
-
Sprite functions for mi layer.
See also:
dmxcursor.c

+

Sprite functions for mi layer.

+
See also:
dmxcursor.c
+
dmxscrinit.c
-
+ +

Referenced by dmxScreenInit().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html deleted file mode 100644 index c9a7c8d4d..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcursor.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   David H. Dawes <dawes@xfree86.org>
-00032  *   Kevin E. Martin <kem@redhat.com>
-00033  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00034  *
-00035  */
-00036 
-00040 #ifndef DMXCURSOR_H
-00041 #define DMXCURSOR_H
-00042 
-00043 #include "mipointer.h"
-00044 
-00046 typedef struct _dmxCursorPriv {
-00047     Cursor  cursor;
-00048 } dmxCursorPrivRec, *dmxCursorPrivPtr;
-00049 
-00051 extern miPointerScreenFuncRec dmxPointerCursorFuncs;
-00053 extern miPointerSpriteFuncRec dmxPointerSpriteFuncs;
-00054 
-00055 extern void dmxReInitOrigins(void);
-00056 extern void dmxInitOrigins(void);
-00057 extern void dmxInitOverlap(void);
-00058 extern void dmxCursorNoMulti(void);
-00059 extern void dmxMoveCursor(ScreenPtr pScreen, int x, int y);
-00060 extern void dmxCheckCursor(void);
-00061 extern int  dmxOnScreen(int x, int y, DMXScreenInfo *dmxScreen);
-00062 extern void dmxHideCursor(DMXScreenInfo *dmxScreen);
-00063 
-00064 extern void dmxBECreateCursor(ScreenPtr pScreen, CursorPtr pCursor);
-00065 extern Bool dmxBEFreeCursor(ScreenPtr pScreen, CursorPtr pCursor);
-00066 
-00067 #define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen)                         \
-00068     (dmxCursorPrivPtr)(_pCursor)->devPriv[(_pScreen)->myNum]
-00069 
-00070 #endif /* DMXCURSOR_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html index 3bb81f00f..93ac65165 100644 --- a/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html @@ -6,484 +6,464 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxcursor.h File Reference

#include "mipointer.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxcursor.h File Reference

#include "mipointer.h"
+ +

Go to the source code of this file.

+

Data Structures

struct  _dmxCursorPriv

Typedefs

typedef _dmxCursorPriv dmxCursorPrivRec
typedef _dmxCursorPriv * dmxCursorPrivPtr

Functions

void dmxReInitOrigins (void)
void dmxInitOrigins (void)
void dmxInitOverlap (void)
void dmxCursorNoMulti (void)
void dmxMoveCursor (ScreenPtr pScreen, int x, int y)
void dmxCheckCursor (void)
int dmxOnScreen (int x, int y, DMXScreenInfo *dmxScreen)
void dmxHideCursor (DMXScreenInfo *dmxScreen)
void dmxBECreateCursor (ScreenPtr pScreen, CursorPtr pCursor)
Bool dmxBEFreeCursor (ScreenPtr pScreen, CursorPtr pCursor)

Variables

miPointerScreenFuncRec dmxPointerCursorFuncs
miPointerSpriteFuncRec dmxPointerSpriteFuncs
+ + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _dmxCursorPriv

Defines

#define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen)
#define DMX_SET_CURSOR_PRIV(_pCursor, _pScreen, v)   dixSetPrivate(&(_pCursor)->devPrivates, CursorScreenKey(_pScreen), v)

Typedefs

typedef struct _dmxCursorPriv dmxCursorPrivRec
typedef struct _dmxCursorPriv * dmxCursorPrivPtr

Functions

void dmxReInitOrigins (void)
void dmxInitOrigins (void)
void dmxInitOverlap (void)
void dmxCursorNoMulti (void)
void dmxMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
void dmxCheckCursor (void)
int dmxOnScreen (int x, int y, DMXScreenInfo *dmxScreen)
void dmxHideCursor (DMXScreenInfo *dmxScreen)
void dmxBECreateCursor (ScreenPtr pScreen, CursorPtr pCursor)
Bool dmxBEFreeCursor (ScreenPtr pScreen, CursorPtr pCursor)

Variables

miPointerScreenFuncRec dmxPointerCursorFuncs
miPointerSpriteFuncRec dmxPointerSpriteFuncs
-

Detailed Description

-Interface for cursor support.
See also:
dmxcursor.c.
-

Typedef Documentation

-

- - - - -
- +

Detailed Description

+

Interface for cursor support.

+
See also:
dmxcursor.c.
+

Define Documentation

+ +
+
+
-
typedef struct _dmxCursorPriv * dmxCursorPrivPtr -
-
- - - - - -
-   - - -

-Cursor private area.

-

- - - - -
- + + + + - + + + + + +
#define DMX_GET_CURSOR_PRIV(_pCursor,
typedef struct _dmxCursorPriv dmxCursorPrivRec + _pScreen  ) 
-
- - - - - -
-   - - -

-Cursor private area.

-

Function Documentation

-

- - - - -
- + +
+Value:
((dmxCursorPrivPtr) \
+    dixLookupPrivate(&(_pCursor)->devPrivates, CursorScreenKey(_pScreen)))
+
+

Referenced by _dmxRealizeCursor(), _dmxSetCursor(), _dmxUnrealizeCursor(), dmxBECreateCursor(), and dmxBEFreeCursor().

+ +
+ + +
+
+
- - - - + + + + - - - + + - - + + + + -
void dmxBECreateCursor ( ScreenPtr  pScreen, #define DMX_SET_CURSOR_PRIV(_pCursor,
CursorPtr  pCursor_pScreen,
) v  )    dixSetPrivate(&(_pCursor)->devPrivates, CursorScreenKey(_pScreen), v)
-
- - - - - -
-   - - -

-Create pCursor on the back-end associated with pScreen.

-

- - - - -
- + +
+ +

Referenced by _dmxRealizeCursor(), and _dmxUnrealizeCursor().

+ +
+ +

Typedef Documentation

+ +
+
+
- - - - + +
Bool dmxBEFreeCursor ( ScreenPtr  pScreen, typedef struct _dmxCursorPriv * dmxCursorPrivPtr
+ +
+ +
+ + +
+
+ + + +
typedef struct _dmxCursorPriv dmxCursorPrivRec
+
+
+

Cursor private area.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + - - - + + - - + + -
void dmxBECreateCursor (ScreenPtr  pScreen,
CursorPtr  pCursorCursorPtr  pCursor 
) )
-
- - - - - -
-   - - -

-Free pCursor on the back-end associated with pScreen.

-

- - - - -
- + +
+

Create pCursor on the back-end associated with pScreen.

+ +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, _dmxCursorPriv::cursor, DMX_GET_CURSOR_PRIV, dmxFatal, dmxLog(), dmxScreens, dmxSync(), _myPrivate::gc, _DMXScreenInfo::scrnDefDrawables, and _DMXScreenInfo::scrnWin.

+ +

Referenced by _dmxRealizeCursor(), and dmxBECreateResources().

+ +
+ + +
+
+
- - - - - - + + + + - -
void dmxCheckCursor ( void   ) Bool dmxBEFreeCursor (ScreenPtr  pScreen,
-
- - - - - -
-   - - -

-This routine is called during reconfiguration to make sure the cursor is visible.

-

- - - - -
- - - - - - - + + + + - -
void dmxCursorNoMulti ( void   ) CursorPtr  pCursor 
-
- - - - - -
-   - - -

-Turn off support for displaying multiple cursors on overlapped back-end displays. See #dmxCursorDoMultiCursors.

-

- - - - -
- - - - - - - + + + +
void dmxHideCursor ( DMXScreenInfo *  dmxScreen  ) )
+ +
+

Free pCursor on the back-end associated with pScreen.

+ +

References _DMXScreenInfo::beDisplay, _dmxCursorPriv::cursor, DMX_GET_CURSOR_PRIV, and dmxScreens.

+

Referenced by _dmxUnrealizeCursor(), and dmxBEDestroyResources().

+ +
+ + +
+
+ + + + + + + + +
void dmxCheckCursor (void  ) 
-
- - - - - -
-   - - -

-This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input.

See also:
dmxbackend.c
-
-

- - - - -
- + +
+

This routine is called during reconfiguration to make sure the cursor is visible.

+ +

References _dmxRealizeCursor(), _dmxSetCursor(), _DMXScreenInfo::cursor, DMXDBG2, dmxFindCursor(), dmxFindFirstScreen(), dmxGetGlobalPosition(), dmxNumScreens, dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +

Referenced by dmxAdjustCursorBoundaries(), and dmxBackendUpdatePosition().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInitOrigins ( void   ) void dmxCursorNoMulti (void  ) 
+ +
+

Turn off support for displaying multiple cursors on overlapped back-end displays. See dmxCursorDoMultiCursors.

+ +

References dmxCursorDoMultiCursors.

+ +

Referenced by ddxProcessArgument().

+
+ + +
+
+ + + + + + + + +
void dmxHideCursor (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - - -

-Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use dmxReInitOrigins() instead.

-

- - - - -
- + +
+

This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input.

+
See also:
dmxbackend.c
+ +

References _dmxSetCursor(), dmxGetGlobalPosition(), and _DMXScreenInfo::index.

+ +

Referenced by dmxBackendUpdatePosition().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInitOverlap ( void   ) void dmxInitOrigins (void  ) 
+ +
+

Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use dmxReInitOrigins() instead.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, dmxComputeScreenOrigins(), dmxFatal, dmxLog(), dmxLogOutput(), dmxNumScreens, dmxReInitOrigins(), dmxScreens, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _DMXScreenInfo::where, _DMXScreenInfo::whereX, and _DMXScreenInfo::whereY.

+

Referenced by InitOutput().

+ +
+ + +
+
+ + + + + + + + +
void dmxInitOverlap (void  ) 
-
- - - - - -
-   - - -

-Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .

-

- - - - -
- + +
+

Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .

+ +

References _DMXScreenInfo::cursorNotShared, DMXDBG6, dmxDoesOverlap(), dmxInfo, dmxIterateOverlap(), dmxLog(), dmxLogOutput(), dmxLogOutputCont(), dmxNumScreens, dmxPrintOverlap(), dmxPropertyIterate(), dmxScreens, dmxTestSameDisplay(), _DMXScreenInfo::index, _DMXScreenInfo::name, and _DMXScreenInfo::over.

+ +

Referenced by dmxAdjustCursorBoundaries(), and InitOutput().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + + + + + + - - + + - - + + -
void dmxMoveCursor ( ScreenPtr  pScreen, void dmxMoveCursor (DeviceIntPtr  pDev,
int  x, ScreenPtr  pScreen,
int  x,
int  yint  y 
) )
-
- - - - - -
-   - - -

-Move the cursor to coordinates (x, y)on pScreen. This function is usually called via dmxPointerSpriteFuncs, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.

-

- - - - -
- + +
+

Move the cursor to coordinates (x, y)on pScreen. This function is usually called via dmxPointerSpriteFuncs, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.

+

The coords (x,y) are in global coord space. We'll loop over the back-end screens and see if they contain the global coord. If so, call _dmxMoveCursor() (XWarpPointer) to position the pointer on that screen.

+ +

References _dmxMoveCursor(), _dmxRealizeCursor(), _dmxSetCursor(), _DMXScreenInfo::cursor, _DMXScreenInfo::cursorNotShared, _DMXScreenInfo::cursorVisible, dmxCursorDoMultiCursors, DMXDBG3, dmxFindCursor(), dmxOnScreen(), dmxScreens, _DMXScreenInfo::index, _DMXScreenInfo::over, _DMXScreenInfo::rootXOrigin, and _DMXScreenInfo::rootYOrigin.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
int dmxOnScreen ( int  x, int dmxOnScreen (int  x,
int  y, int  y,
DMXScreenInfo *  dmxScreenDMXScreenInfo *  dmxScreen 
) )
-
- - - - - -
-   - - -

-Returns non-zero if the global x, y coordinate is on the screen window of the dmxScreen.

-

- - - - -
- + +
+

Returns non-zero if the global x, y coordinate is on the screen window of the dmxScreen.

+ +

References dmxDebug, dmxLog(), _DMXScreenInfo::index, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by dmxBackendFindOverlapping(), dmxBackendOffscreen(), dmxCheckCursor(), dmxDoesOverlap(), dmxFindFirstScreen(), dmxMoveCursor(), and dmxSetCursor().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxReInitOrigins ( void   ) void dmxReInitOrigins (void  ) 
-
- - - - - -
-   - - -

-Recompute origin information in the dmxScreens list. This is either called from dmxInitOrigins() or from #dmxReconfig().

-

Variable Documentation

-

- - - - -
- + +
+

Recompute origin information in the dmxScreens list. This is called from dmxInitOrigins.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, dmxFatal, dmxLog(), dmxLogOutput(), dmxNumScreens, dmxScreens, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by dmxAdjustCursorBoundaries(), and dmxInitOrigins().

+ +
+ +

Variable Documentation

+ +
+
+
- +
miPointerScreenFuncRec dmxPointerCursorFuncs + miPointerScreenFuncRec dmxPointerCursorFuncs
-
- - - - - -
-   - - -

-Cursor functions for mi layer.

See also:
dmxcursor.c

+ +

+

Cursor functions for mi layer.

+
See also:
dmxcursor.c
+
dmxscrinit.c
-
-

- - - - -
- + +

Referenced by dmxScreenInit().

+ + + + +
+
+
- +
miPointerSpriteFuncRec dmxPointerSpriteFuncs + miPointerSpriteFuncRec dmxPointerSpriteFuncs
-
- - - - - -
-   - - -

-Sprite functions for mi layer.

See also:
dmxcursor.c

+ +

+

Sprite functions for mi layer.

+
See also:
dmxcursor.c
+
dmxscrinit.c
-
+ +

Referenced by dmxScreenInit().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html new file mode 100644 index 000000000..6211c73eb --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html @@ -0,0 +1,102 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html b/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html index e311a99bd..b1394f74c 100644 --- a/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html @@ -6,56 +6,65 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxdetach.c File Reference

#include "dmxinputinit.h"
-#include "dmxextension.h"
- - - - - + + +
+

dmxdetach.c File Reference

#include "dmxinputinit.h"
+#include "dmxextension.h"
+

Functions

void dmxInputDetach (DMXScreenInfo *dmxScreen, Bool reserveId)
+ +

Functions

void dmxInputDetach (DMXScreenInfo *dmxScreen, Bool reserveId)
-

Detailed Description

-Provide support and helper functions for input detach and attach.

Function Documentation

-

- - - - -
- +

Detailed Description

+

Provide support and helper functions for input detach and attach.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxInputDetach ( DMXScreenInfo *  dmxScreen, void dmxInputDetach (DMXScreenInfo *  dmxScreen,
Bool  reserveIdBool  reserveId 
) )
-
- - - - - -
-   - + +
+

Search for input associated with dmxScreen, and detach.

-

-Search for input associated with dmxScreen, and detach.

+

References _DMXInputInfo::detached, dmxInputs, dmxLogInput(), dmxNumInputs, _DMXScreenInfo::index, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxInputDetachAll(), and dmxInputDetachId().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html index 4ad87da6d..2912b4e7c 100644 --- a/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html @@ -6,114 +6,161 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxdpms.c File Reference

#include "dmx.h"
-#include "dmxdpms.h"
-#include "dmxlog.h"
-#include "dmxsync.h"
-#include "dpmsproc.h"
-#include "windowstr.h"
-#include "X11/extensions/dpms.h"
- - - - + + +
+

dmxdpms.c File Reference

#include "dmx.h"
+#include "dmxdpms.h"
+#include "dmxlog.h"
+#include "dmxsync.h"
+#include "windowstr.h"
+#include <X11/extensions/dpms.h>
+

Functions

void dmxDPMSInit (DMXScreenInfo *dmxScreen)
+ + + + + + + + +

Functions

static void _dmxDPMSInit (DMXScreenInfo *dmxScreen)
void dmxDPMSInit (DMXScreenInfo *dmxScreen)
void dmxDPMSTerm (DMXScreenInfo *dmxScreen)
void dmxDPMSWakeup (void)

Variables

static unsigned long dpmsGeneration = 0
static Bool dpmsSupported = TRUE
+

Detailed Description

+

Provides DPMS support and unifies all DPMS and other screen-saver support in one file. If -dpms is given on the command line, or the Xdmx server is not compiled with DPMS support, then the DPMS extension does not work for clients, but DPMS on the backends is still disables (and restored at Xdmx server shutdown time).

+

Function Documentation

+ +
+
+ + + + + + + + + +
static void _dmxDPMSInit (DMXScreenInfo *  dmxScreen )  [static]
+
+
-void dmxDPMSTerm (DMXScreenInfo *dmxScreen) +

References _DMXScreenInfo::beDisplay, dmxLogOutput(), _DMXScreenInfo::dpmsCapable, _DMXScreenInfo::dpmsEnabled, dpmsGeneration, _DMXScreenInfo::dpmsOff, _DMXScreenInfo::dpmsStandby, dpmsSupported, and _DMXScreenInfo::dpmsSuspend.

-void dmxDPMSWakeup (void) +

Referenced by dmxDPMSInit().

- -

Detailed Description

-Provides DPMS support and unifies all DPMS and other screen-saver support in one file. If -dpms is given on the command line, or the Xdmx server is not compiled with DPMS support, then the DPMS extension does not work for clients, but DPMS on the backends is still disables (and restored at Xdmx server shutdown time).

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
void dmxDPMSInit ( DMXScreenInfo *  dmxScreen  ) void dmxDPMSInit (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - + +
+

Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in dmxDPMSTerm.

-

-Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in dmxDPMSTerm.

-

- - - - -
- +

References _dmxDPMSInit(), _DMXScreenInfo::beDisplay, dmxSync(), and _DMXScreenInfo::savedTimeout.

+ +

Referenced by dmxBEScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + +
void dmxDPMSTerm ( DMXScreenInfo *  dmxScreen  ) void dmxDPMSTerm (DMXScreenInfo *  dmxScreen ) 
+ +
+

Terminate DPMS support on dmxScreen. We restore the settings saved in dmxDPMSInit.

+ +

References _DMXScreenInfo::beDisplay, dmxSync(), _DMXScreenInfo::dpmsCapable, _DMXScreenInfo::dpmsEnabled, _DMXScreenInfo::dpmsOff, _DMXScreenInfo::dpmsStandby, _DMXScreenInfo::dpmsSuspend, and _DMXScreenInfo::savedTimeout.

+

Referenced by dmxBECloseScreen().

+ +
+ + +
+
+ + + + + + + + +
void dmxDPMSWakeup (void  ) 
-
- - - - - -
-   - + +
+

Called when activity is detected so that DPMS power-saving mode can be deactivated.

-

-Terminate DPMS support on dmxScreen. We restore the settings saved in dmxDPMSInit.

-

- - - - -
- + + +

Variable Documentation

+ +
+
+
- - - - - - + +
void dmxDPMSWakeup ( void   ) unsigned long dpmsGeneration = 0 [static]
+ +
+

Referenced by _dmxDPMSInit().

+ +
+ + +
+
+ + + +
Bool dpmsSupported = TRUE [static]
-
- - - - - -
-   - + +
-

-Called when activity is detected so that DPMS power-saving mode can be deactivated.

+

Referenced by _dmxDPMSInit().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html deleted file mode 100644 index ff74d3ab5..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxdpms.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2003 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Author:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXDPMS_H_
-00039 #define _DMXDPMS_H_
-00040 extern void dmxDPMSInit(DMXScreenInfo *dmxScreen);
-00041 extern void dmxDPMSTerm(DMXScreenInfo *dmxScreen);
-00042 extern void dmxDPMSWakeup(void); /* Call when input is processed */
-00043 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html index 45b5a6495..d9254f24b 100644 --- a/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html @@ -6,110 +6,101 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxdpms.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxDPMSInit (DMXScreenInfo *dmxScreen)
void dmxDPMSTerm (DMXScreenInfo *dmxScreen)
void dmxDPMSWakeup (void)
+ + + +

Functions

void dmxDPMSInit (DMXScreenInfo *dmxScreen)
void dmxDPMSTerm (DMXScreenInfo *dmxScreen)
void dmxDPMSWakeup (void)
-

Detailed Description

-Interface for DPMS extension support.
See also:
dmxdpms.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for DPMS extension support.

+
See also:
dmxdpms.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxDPMSInit ( DMXScreenInfo *  dmxScreen  ) void dmxDPMSInit (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - + +
+

Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in dmxDPMSTerm.

-

-Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in dmxDPMSTerm.

-

- - - - -
- +

References _dmxDPMSInit(), _DMXScreenInfo::beDisplay, dmxSync(), and _DMXScreenInfo::savedTimeout.

+ +

Referenced by dmxBEScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxDPMSTerm ( DMXScreenInfo *  dmxScreen  ) void dmxDPMSTerm (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - + +
+

Terminate DPMS support on dmxScreen. We restore the settings saved in dmxDPMSInit.

-

-Terminate DPMS support on dmxScreen. We restore the settings saved in dmxDPMSInit.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, dmxSync(), _DMXScreenInfo::dpmsCapable, _DMXScreenInfo::dpmsEnabled, _DMXScreenInfo::dpmsOff, _DMXScreenInfo::dpmsStandby, _DMXScreenInfo::dpmsSuspend, and _DMXScreenInfo::savedTimeout.

+ +

Referenced by dmxBECloseScreen().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxDPMSWakeup ( void   ) void dmxDPMSWakeup (void  ) 
-
- - - - - -
-   - + +
+

Called when activity is detected so that DPMS power-saving mode can be deactivated.

-

-Called when activity is detected so that DPMS power-saving mode can be deactivated.

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html new file mode 100644 index 000000000..892d60eeb --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html @@ -0,0 +1,75 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html index d497e154a..f504a462f 100644 --- a/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html @@ -6,97 +6,95 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxdummy.c File Reference

#include "dmx.h"
-#include "dmxinputinit.h"
-#include "dmxdummy.h"
- - - - - - - + + +
+

dmxdummy.c File Reference

#include "dmx.h"
+#include "dmxinputinit.h"
+#include "dmxdummy.h"
+

Functions

void dmxDummyKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxDummyMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+ + +

Functions

void dmxDummyKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxDummyMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
-

Detailed Description

-Provide mouse and keyboard that are sufficient for starting the X server, but that don't actually provide any events. This is useful for testing.

Function Documentation

-

- - - - -
- +

Detailed Description

+

Provide mouse and keyboard that are sufficient for starting the X server, but that don't actually provide any events. This is useful for testing.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxDummyKbdGetInfo ( DevicePtr  pDev, void dmxDummyKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Return information about the dummy keyboard device specified in pDev into the structure pointed to by info. The keyboard is set up to have 1 valid key code that is NoSymbol

-

-Return information about the dummy keyboard device specified in pDev into the structure pointed to by info. The keyboard is set up to have 1 valid key code that is NoSymbol

-

- - - - -
- +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::force, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, and _DMXLocalInitInfo::keySyms.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxDummyMouGetInfo ( DevicePtr  pDev, void dmxDummyMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Return information about the dummy mouse device specified in pDev into the structure pointed to by info. They mouse has 3 buttons and two axes.

-

-Return information about the dummy mouse device specified in pDev into the structure pointed to by info. They mouse has 3 buttons and two axes.

+

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html deleted file mode 100644 index 907b0f0aa..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxdummy.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXDUMMY_H_
-00039 #define _DMXDUMMY_H_
-00040 
-00041 extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00042 extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00043 
-00044 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html index ca868f943..158731b70 100644 --- a/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html @@ -6,97 +6,95 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxdummy.h File Reference

-

-Go to the source code of this file. - - - - - - +

Go to the source code of this file.

+

Functions

void dmxDummyMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxDummyKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+ + +

Functions

void dmxDummyMouGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
void dmxDummyKbdGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
-

Detailed Description

-Interface to dummy input device support.
See also:
dmxdummy.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to dummy input device support.

+
See also:
dmxdummy.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxDummyKbdGetInfo ( DevicePtr  pDev, void dmxDummyKbdGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Return information about the dummy keyboard device specified in pDev into the structure pointed to by info. The keyboard is set up to have 1 valid key code that is NoSymbol

-

-Return information about the dummy keyboard device specified in pDev into the structure pointed to by info. The keyboard is set up to have 1 valid key code that is NoSymbol

-

- - - - -
- +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::force, _DMXLocalInitInfo::freemap, _DMXLocalInitInfo::kbdFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, and _DMXLocalInitInfo::keySyms.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxDummyMouGetInfo ( DevicePtr  pDev, void dmxDummyMouGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Return information about the dummy mouse device specified in pDev into the structure pointed to by info. They mouse has 3 buttons and two axes.

-

-Return information about the dummy mouse device specified in pDev into the structure pointed to by info. They mouse has 3 buttons and two axes.

+

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html new file mode 100644 index 000000000..0eff00785 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html @@ -0,0 +1,76 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8c.html b/xorg-server/hw/dmx/doc/html/dmxeq_8c.html deleted file mode 100644 index ccf71b829..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxeq_8c.html +++ /dev/null @@ -1,269 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxeq.c File Reference

#include "dmx.h"
-#include "dmxeq.h"
-#include "dmxinput.h"
-#include "dmxlog.h"
-#include "dmxdpms.h"
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "XIproto.h"
-#include "extinit.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  _Event
struct  _EventQueue

Defines

#define QUEUE_SIZE   256

Typedefs

typedef _Event EventRec
typedef _Event * EventPtr
typedef _EventQueue EventQueueRec
typedef _EventQueue * EventQueuePtr

Functions

void dmxeqEnqueue (xEvent *e)
void dmxeqSwitchScreen (ScreenPtr pScreen, Bool fromDIX)
void dmxeqProcessInputEvents (void)
-

Detailed Description

-This file provides an event queue that knows about XInput events. All of the code is based on mi/mieq.c and was modified as little as possible to provide XInput event support (the copyright and some of the comments are from The Open Group, Keith Packard, MIT X Consortium). (Another example of similar code is provided in hw/xfree86/common/xf86Xinput.c.)

Define Documentation

-

- - - - -
- - -
#define QUEUE_SIZE   256 -
-
- - - - - -
-   - - -

-The size of our queue. (The queue provided by mi/mieq.c has a size of 256.)

-

Typedef Documentation

-

- - - - -
- - -
typedef struct _Event * EventPtr -
-
- - - - - -
-   - - -

-Information about the event.

-

- - - - -
- - -
typedef struct _EventQueue * EventQueuePtr -
-
- - - - - -
-   - - -

-Event queue.

-

- - - - -
- - -
typedef struct _EventQueue EventQueueRec -
-
- - - - - -
-   - - -

-Event queue.

-

- - - - -
- - -
typedef struct _Event EventRec -
-
- - - - - -
-   - - -

-Information about the event.

-

Function Documentation

-

- - - - -
- - - - - - - - - - -
void dmxeqEnqueue ( xEvent *  e  ) 
-
- - - - - -
-   - - -

-This function adds an event to the end of the queue. If the event is an XInput event, then the next event (the valuator event) is also stored in the queue. If the new event has a time before the time of the last event currently on the queue, then the time is updated for the new event.

-Must be reentrant with ProcessInputEvents. Assumption: dmxeqEnqueue will never be interrupted. If this is called from both signal handlers and regular code, make sure the signal is suspended when called from regular code.

-

- - - - -
- - - - - - - - - - -
void dmxeqProcessInputEvents ( void   ) 
-
- - - - - -
-   - - -

-This function is called from ProcessInputEvents() to remove events from the queue and process them.

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
void dmxeqSwitchScreen ( ScreenPtr  pScreen,
Bool  fromDIX
) 
-
- - - - - -
-   - - -

-Make pScreen the new screen for enqueueing events. If fromDIX is TRUE, also make pScreen the new screen for dequeuing events.

-

-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html deleted file mode 100644 index dc73d8e2a..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxeq.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00040 #ifndef _DMXEQ_H_
-00041 #define _DMXEQ_H_
-00042 extern Bool dmxeqInit(DevicePtr pKbd, DevicePtr pPtr);
-00043 extern void dmxeqProcessInputEvents(void);
-00044 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8h.html b/xorg-server/hw/dmx/doc/html/dmxeq_8h.html deleted file mode 100644 index 255528ce9..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxeq_8h.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxeq.h File Reference

-

-Go to the source code of this file. - - - - -

Functions

void dmxeqProcessInputEvents (void)
-

Detailed Description

-Interface to the event queue support. Some of these functions are included in dmxinput.h, since they are used by top-level .c files.
See also:
dmxeq.c

-dmxinput.h

-

Function Documentation

-

- - - - -
- - - - - - - - - - -
void dmxeqProcessInputEvents ( void   ) 
-
- - - - - -
-   - - -

-This function is called from ProcessInputEvents() to remove events from the queue and process them.

-

-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8c.html b/xorg-server/hw/dmx/doc/html/dmxevents_8c.html index 105749a00..ad24bc82a 100644 --- a/xorg-server/hw/dmx/doc/html/dmxevents_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxevents_8c.html @@ -6,270 +6,1084 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxevents.c File Reference

#include "dmxinputinit.h"
-#include "dmxevents.h"
-#include "dmxcb.h"
-#include "dmxcommon.h"
-#include "dmxcursor.h"
-#include "dmxmotion.h"
-#include "dmxeq.h"
-#include "dmxsigio.h"
-#include "dmxmap.h"
-#include "keysym.h"
-#include "opaque.h"
-#include "inputstr.h"
-#include "mipointer.h"
-#include "XIstubs.h"
- - - - - - - - - - - - - + + +
+

dmxevents.c File Reference

#include "dmxinputinit.h"
+#include "dmxevents.h"
+#include "dmxcb.h"
+#include "dmxcommon.h"
+#include "dmxcursor.h"
+#include "dmxmotion.h"
+#include "dmxsigio.h"
+#include "dmxmap.h"
+#include <X11/keysym.h>
+#include "opaque.h"
+#include "inputstr.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "exglobals.h"
+#include "xkbsrv.h"
+#include "XIstubs.h"
+

Functions

void dmxGetGlobalPosition (int *x, int *y)
void dmxInvalidateGlobalPosition (void)
void dmxMotion (DevicePtr pDev, int *v, int firstAxes, int axesCount, DMXMotionType type, DMXBlockType block)
void dmxEnqueue (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
int dmxCheckSpecialKeys (DevicePtr pDev, KeySym keySym)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_EVENTS_DEBUG   0
#define DMXDBG0(f)
#define DMXDBG1(f, a)
#define DMXDBG2(f, a, b)
#define DMXDBG3(f, a, b, c)
#define DMXDBG4(f, a, b, c, d)
#define DMXDBG5(f, a, b, c, d, e)
#define DMXDBG6(f, a, b, c, d, e, g)
#define DMXDBG7(f, a, b, c, d, e, g, h)
#define DMX_MAX_AXES   32
#define EXTRACT_VALUATORS(ke, valuators)

Functions

static int dmxApplyFunctions (DMXInputInfo *dmxInput, DMXFunctionType f)
static int dmxCheckFunctionKeys (DMXLocalInputInfoPtr dmxLocal, int type, KeySym keySym)
DMXScreenInfo * dmxFindFirstScreen (int x, int y)
static void enqueueMotion (DevicePtr pDev, int x, int y)
void dmxCoreMotion (DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
static void dmxExtMotion (DMXLocalInputInfoPtr dmxLocal, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)
static int dmxTranslateAndEnqueueExtEvent (DMXLocalInputInfoPtr dmxLocal, XEvent *e, DMXBlockType block)
static int dmxGetButtonMapping (DMXLocalInputInfoPtr dmxLocal, int button)
void dmxGetGlobalPosition (int *x, int *y)
void dmxInvalidateGlobalPosition (void)
void dmxMotion (DevicePtr pDev, int *v, int firstAxes, int axesCount, DMXMotionType type, DMXBlockType block)
static KeySym dmxKeyCodeToKeySym (DMXLocalInputInfoPtr dmxLocal, KeyCode keyCode)
static KeyCode dmxKeySymToKeyCode (DMXLocalInputInfoPtr dmxLocal, KeySym keySym, int tryFirst)
static int dmxFixup (DevicePtr pDev, int detail, KeySym keySym)
void dmxEnqueue (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
int dmxCheckSpecialKeys (DevicePtr pDev, KeySym keySym)

Variables

static int dmxGlobalX
static int dmxGlobalY
static int dmxGlobalInvalid
-

Detailed Description

-Provide support and helper functions for enqueing events received by the low-level input drivers.

Function Documentation

-

- - - - -
- +

Detailed Description

+

Provide support and helper functions for enqueing events received by the low-level input drivers.

+

Define Documentation

+ +
+
+
- - - - + +
int dmxCheckSpecialKeys ( DevicePtr  pDev, #define DMX_EVENTS_DEBUG   0
+ +
+ +
+ + +
+
+ + + +
#define DMX_MAX_AXES   32
+
+
+ +

Referenced by dmxExtMotion(), othUSBGetInfo(), and usbRead().

+ +
+
+ +
+
+ + + + + + + + +
#define DMXDBG0(f  ) 
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + +
#define DMXDBG1(f,
a  ) 
+
+
+ +
+
+ +
+
+ + + + + + + + - - + + + + + + - - +
#define DMXDBG2(f,
KeySym  keySyma,
b  )  ) 
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG3(f,
a,
b,
c  ) 
-
- - - - - -
-   - - -

-A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + + + + + + + + + + + - - - - + + + + + + + - - +
#define DMXDBG4(f,
a,
b,
void dmxEnqueue ( DevicePtr  pDev, c,
d  )  int  type,
+ +
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + - - + + + + + + + +
#define DMXDBG5(f,
a,
b,
c,
int  detail, d,
e  ) 
+
+
+ +
+
+ +
+
+ + + + + + + + - - + + + + + + - - + + + + + + - - + + + + + + - - +
#define DMXDBG6(f,
KeySym  keySym, a,
b,
XEvent *  e, c,
d,
DMXBlockType  blocke,
g  )  ) 
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define DMXDBG7(f,
a,
b,
c,
d,
e,
g,
h  ) 
-
- - - - - -
-   - - -

-Enqueue a non-motion event from the pDev device with the specified type and detail. If the event is a KeyPress or KeyRelease event, then the keySym is also specified.

-If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - + + + + + + + + + +
void dmxGetGlobalPosition ( int *  x, #define EXTRACT_VALUATORS(ke,
valuators  ) 
+ +
+Value:
valuators[0]       = ke->axis_data[0]; \
+        valuators[1]       = ke->axis_data[1]; \
+        valuators[2]       = ke->axis_data[2]; \
+        valuators[3]       = ke->axis_data[3]; \
+        valuators[4]       = ke->axis_data[4]; \
+        valuators[5]       = ke->axis_data[5]; \
+
+

Referenced by dmxTranslateAndEnqueueExtEvent().

+ +
+ +

Function Documentation

+ +
+
+ + + + + + + + + - - + + - - + + +
static int dmxApplyFunctions (DMXInputInfo *  dmxInput,
int *  yDMXFunctionType  f 
) ) [static]
+
+
+

References _DMXLocalInputInfo::binding, _DMXInputInfo::devs, _DMXLocalInputInfo::functions, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::private.

+ +

Referenced by dmxCheckFunctionKeys().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static int dmxCheckFunctionKeys (DMXLocalInputInfoPtr  dmxLocal,
int  type,
KeySym  keySym 
) [static]
-
- - - - - -
-   - - -

-Return DMX's notion of the pointer position in the global coordinate space.

-

- - - - -
- + +
+ +

References DMX_FUNCTION_FINE, DMX_FUNCTION_GRAB, DMX_FUNCTION_TERMINATE, dmxApplyFunctions(), DMXDBG3, dmxInfo, dmxInputs, dmxLocalCoreKeyboard, dmxLog(), _DMXLocalInputInfo::inputIdx, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxEnqueue().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + +
void dmxInvalidateGlobalPosition ( void   ) int dmxCheckSpecialKeys (DevicePtr  pDev,
KeySym  keySym 
)
+ +
+

A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.

+ +

References DMXDBG2, dmxInfo, dmxLocalCoreKeyboard, dmxLog(), GETDMXINPUTFROMPDEV, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxCoreMotion (DevicePtr  pDev,
int  x,
int  y,
int  delta,
DMXBlockType  block 
)
-
- - - - - -
-   - - -

-Invalidate the global position for #dmxCoreMotion.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::binding, _DMXInputInfo::detached, _DMXInputInfo::devs, DMXDBG4, DMXDBG5, DMXDBG6, dmxFindFirstScreen(), dmxGlobalHeight, dmxGlobalInvalid, dmxGlobalWidth, dmxGlobalX, dmxGlobalY, dmxInputs, dmxNumInputs, dmxScreens, dmxSigioBlock(), dmxSigioUnblock(), enqueueMotion(), _DMXScreenInfo::index, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, ProcessInputEvents(), _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootYOrigin, _DMXLocalInputInfo::sendsCore, and _DMXLocalInputInfo::update_position.

+ +

Referenced by dmxMotion(), and dmxSetCursor().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxEnqueue (DevicePtr  pDev,
int  type,
int  detail,
KeySym  keySym,
XEvent *  e,
DMXBlockType  block 
)
+ +
+

Enqueue an event from the pDev device with the specified type and detail. If the event is a KeyPress or KeyRelease event, then the keySym is also specified.

+

FIXME: make the code do what the comment says, or remove this comment. If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

+ +

References dmxCheckFunctionKeys(), DMXDBG2, dmxEventName(), dmxFixup(), dmxGetButtonMapping(), dmxKeyCodeToKeySym(), dmxLocalCoreKeyboard, dmxLogInput(), dmxTranslateAndEnqueueExtEvent(), GETDMXINPUTFROMPDEV, ProximityIn, and ProximityOut.

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + + + + +
static void dmxExtMotion (DMXLocalInputInfoPtr  dmxLocal,
int *  v,
int  firstAxis,
void dmxMotion ( DevicePtr  pDev, int  axesCount,
DMXMotionType  type,
int *  v, DMXBlockType  block 
) [static]
+
+
+ +

References DeviceMotionNotify, DeviceValuator, DMX_MAX_AXES, DMX_RELATIVE, dmxSigioBlock(), dmxSigioUnblock(), _DMXLocalInputInfo::lastX, _DMXLocalInputInfo::lastY, _DMXLocalInputInfo::pDevice, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::update_position.

+ +

Referenced by dmxMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXScreenInfo* dmxFindFirstScreen (int  x,
int  y 
)
+
+
+ +

References dmxNumScreens, dmxOnScreen(), and dmxScreens.

+ +

Referenced by dmxCheckCursor(), and dmxCoreMotion().

+ +
+
+ +
+
+ + + + + + + + + - - + + + + + + + - - + + + +
static int dmxFixup (DevicePtr  pDev,
int  firstAxes, int  detail,
KeySym  keySym 
int  axesCount, ) [static]
+
+
+ +

References dmxKeyCodeToKeySym(), dmxKeySymToKeyCode(), dmxLocalCoreKeyboard, dmxLog(), dmxWarning, and GETDMXLOCALFROMPDEV.

+ +

Referenced by dmxEnqueue().

+ +
+
+ +
+
+ + + + + + + + + + + - - + + + +
static int dmxGetButtonMapping (DMXLocalInputInfoPtr  dmxLocal,
int  button 
DMXMotionType  type, ) [static]
+
+
+ +

References dmxLog(), dmxWarning, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxEnqueue().

+ +
+
+ +
+
+ + + + + + + + + + + - - + + +
void dmxGetGlobalPosition (int *  x,
int *  y 
DMXBlockType  block)
+
+
+

Return DMX's notion of the pointer position in the global coordinate space.

+ +

References dmxGlobalX, and dmxGlobalY.

+ +

Referenced by dmxBackendLateReInit(), dmxCheckCursor(), dmxConsoleUpdateFineCursor(), dmxHideCursor(), and dmxSetCursor().

+ +
+
+ +
+
+ + + + + + - - +
void dmxInvalidateGlobalPosition (void  )  ) 
+
+
+

Invalidate the global position for dmxCoreMotion.

+ +

References dmxGlobalInvalid.

+

Referenced by dmxBackendLateReInit().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static KeySym dmxKeyCodeToKeySym (DMXLocalInputInfoPtr  dmxLocal,
KeyCode  keyCode 
) [static]
-
- - - - - -
-   - - -

-Enqueue a motion event for pDev. The v vector has length axesCount, and contains values for each of the axes, starting at firstAxes.

-The type of the motion may be DMX_RELATIVE, DMX_ABSOLUTE, or DMX_ABSOLUTE_CONFINED (in the latter case, the pointer will not be allowed to move outside the global boundaires).

-If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

+ +

+ +

References DMXDBG2, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxEnqueue(), dmxFixup(), and dmxKeySymToKeyCode().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static KeyCode dmxKeySymToKeyCode (DMXLocalInputInfoPtr  dmxLocal,
KeySym  keySym,
int  tryFirst 
) [static]
+
+
+ +

References DMXDBG3, dmxKeyCodeToKeySym(), dmxLocalCoreKeyboard, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxFixup().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxMotion (DevicePtr  pDev,
int *  v,
int  firstAxes,
int  axesCount,
DMXMotionType  type,
DMXBlockType  block 
)
+
+
+

Enqueue a motion event for pDev. The v vector has length axesCount, and contains values for each of the axes, starting at firstAxes.

+

The type of the motion may be DMX_RELATIVE, DMX_ABSOLUTE, or DMX_ABSOLUTE_CONFINED (in the latter case, the pointer will not be allowed to move outside the global boundaires).

+

If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to enqueueMotion().

+ +

References DMX_ABSOLUTE, DMX_ABSOLUTE_CONFINED, DMX_RELATIVE, dmxCoreMotion(), dmxExtMotion(), dmxGlobalX, dmxGlobalY, and GETDMXLOCALFROMPDEV.

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static int dmxTranslateAndEnqueueExtEvent (DMXLocalInputInfoPtr  dmxLocal,
XEvent *  e,
DMXBlockType  block 
) [static]
+
+
+ +

References ChangeDeviceNotify, DeviceFocusIn, DeviceFocusOut, _DMXLocalInputInfo::deviceId, DeviceMappingNotify, DeviceStateNotify, DeviceValuator, _DMXInputInfo::devs, DMX_ABSOLUTE, dmxExtMotion(), dmxInputs, dmxLog(), dmxMapLookup(), dmxSigioBlock(), dmxSigioUnblock(), dmxWarning, EXTRACT_VALUATORS, _DMXLocalInputInfo::inputIdx, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, ProximityIn, ProximityOut, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxEnqueue().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static void enqueueMotion (DevicePtr  pDev,
int  x,
int  y 
) [static]
+
+
+

Enqueue a motion event.

+ +

References GETDMXLOCALFROMPDEV.

+ +

Referenced by dmxCoreMotion().

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
int dmxGlobalInvalid [static]
+
+
+ +

Referenced by dmxCoreMotion(), and dmxInvalidateGlobalPosition().

+ +
+
+ +
+
+ + + + +
int dmxGlobalX [static]
+
+
+ +

Referenced by dmxCoreMotion(), dmxGetGlobalPosition(), and dmxMotion().

+ +
+
+ +
+
+ + + + +
int dmxGlobalY [static]
+
+
+ +

Referenced by dmxCoreMotion(), dmxGetGlobalPosition(), and dmxMotion().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html deleted file mode 100644 index ead3c2d9f..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxevents.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXEVENTS_H_
-00039 #define _DMXEVENTS_H_
-00040 
-00041 extern void dmxMotion(DevicePtr pDev, int *v, int firstAxis, int axesCount,
-00042                       DMXMotionType type, DMXBlockType block);
-00043 extern void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
-00044                        XEvent *e, DMXBlockType block);
-00045 extern int  dmxCheckSpecialKeys(DevicePtr pDev, KeySym keySym);
-00046 extern void dmxInvalidateGlobalPosition(void);
-00047 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h.html index 2aa5910d1..bbf1da023 100644 --- a/xorg-server/hw/dmx/doc/html/dmxevents_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxevents_8h.html @@ -6,219 +6,207 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxevents.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxMotion (DevicePtr pDev, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)
void dmxEnqueue (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
int dmxCheckSpecialKeys (DevicePtr pDev, KeySym keySym)
void dmxInvalidateGlobalPosition (void)
+ + + + +

Functions

void dmxMotion (DevicePtr pDev, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)
void dmxEnqueue (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
int dmxCheckSpecialKeys (DevicePtr pDev, KeySym keySym)
void dmxInvalidateGlobalPosition (void)
-

Detailed Description

-Interface to event processing functions.
See also:
dmxevents.h
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to event processing functions.

+
See also:
dmxevents.h
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxCheckSpecialKeys ( DevicePtr  pDev, int dmxCheckSpecialKeys (DevicePtr  pDev,
KeySym  keySymKeySym  keySym 
) )
-
- - - - - -
-   - + +
+

A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.

-

-A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.

-

- - - - -
- +

References DMXDBG2, dmxInfo, dmxLocalCoreKeyboard, dmxLog(), GETDMXINPUTFROMPDEV, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxEnqueue ( DevicePtr  pDev, void dmxEnqueue (DevicePtr  pDev,
int  type, int  type,
int  detail, int  detail,
KeySym  keySym, KeySym  keySym,
XEvent *  e, XEvent *  e,
DMXBlockType  blockDMXBlockType  block 
) )
-
- - - - - -
-   - + +
+

Enqueue an event from the pDev device with the specified type and detail. If the event is a KeyPress or KeyRelease event, then the keySym is also specified.

+

FIXME: make the code do what the comment says, or remove this comment. If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

-

-Enqueue a non-motion event from the pDev device with the specified type and detail. If the event is a KeyPress or KeyRelease event, then the keySym is also specified.

-If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

-

- - - - -
- - - - - - - - - +

References dmxCheckFunctionKeys(), DMXDBG2, dmxEventName(), dmxFixup(), dmxGetButtonMapping(), dmxKeyCodeToKeySym(), dmxLocalCoreKeyboard, dmxLogInput(), dmxTranslateAndEnqueueExtEvent(), GETDMXINPUTFROMPDEV, ProximityIn, and ProximityOut.

+

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ + + + +
+
+
void dmxInvalidateGlobalPosition ( void   ) 
+ + + + + + + +
void dmxInvalidateGlobalPosition (void  ) 
-
- - - - - -
-   - + +
+

Invalidate the global position for dmxCoreMotion.

-

-Invalidate the global position for #dmxCoreMotion.

-

- - - - -
- +

References dmxGlobalInvalid.

+ +

Referenced by dmxBackendLateReInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxMotion ( DevicePtr  pDev, void dmxMotion (DevicePtr  pDev,
int *  v, int *  v,
int  firstAxes, int  firstAxes,
int  axesCount, int  axesCount,
DMXMotionType  type, DMXMotionType  type,
DMXBlockType  blockDMXBlockType  block 
) )
-
- - - - - -
-   - + +
+

Enqueue a motion event for pDev. The v vector has length axesCount, and contains values for each of the axes, starting at firstAxes.

+

The type of the motion may be DMX_RELATIVE, DMX_ABSOLUTE, or DMX_ABSOLUTE_CONFINED (in the latter case, the pointer will not be allowed to move outside the global boundaires).

+

If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to enqueueMotion().

-

-Enqueue a motion event for pDev. The v vector has length axesCount, and contains values for each of the axes, starting at firstAxes.

-The type of the motion may be DMX_RELATIVE, DMX_ABSOLUTE, or DMX_ABSOLUTE_CONFINED (in the latter case, the pointer will not be allowed to move outside the global boundaires).

-If block is set to DMX_BLOCK, then the SIGIO handler will be blocked around calls to dmxeqEnqueue().

+

References DMX_ABSOLUTE, DMX_ABSOLUTE_CONFINED, DMX_RELATIVE, dmxCoreMotion(), dmxExtMotion(), dmxGlobalX, dmxGlobalY, and GETDMXLOCALFROMPDEV.

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html new file mode 100644 index 000000000..7e430c086 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html @@ -0,0 +1,79 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html deleted file mode 100644 index e18f0f785..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html +++ /dev/null @@ -1,197 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxext.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00040 #ifndef _DMXEXT_H_
-00041 #define _DMXEXT_H_
-00042 
-00043 /* These values must be larger than LastExtensionError.
-00044    The values in dmxext.h and dmxproto.h *MUST* match. */
-00045 #define DmxBadXinerama         1001
-00046 #define DmxBadValue            1002
-00047 #define DmxBadReply            1003
-00048 
-00049 #define DMXScreenWindowWidth   (1L<<0)
-00050 #define DMXScreenWindowHeight  (1L<<1)
-00051 #define DMXScreenWindowXoffset (1L<<2)
-00052 #define DMXScreenWindowYoffset (1L<<3)
-00053 #define DMXRootWindowWidth     (1L<<4)
-00054 #define DMXRootWindowHeight    (1L<<5)
-00055 #define DMXRootWindowXoffset   (1L<<6)
-00056 #define DMXRootWindowYoffset   (1L<<7)
-00057 #define DMXRootWindowXorigin   (1L<<8)
-00058 #define DMXRootWindowYorigin   (1L<<9)
-00059 
-00060 #define DMXDesktopWidth        (1L<<0)
-00061 #define DMXDesktopHeight       (1L<<1)
-00062 #define DMXDesktopShiftX       (1L<<2)
-00063 #define DMXDesktopShiftY       (1L<<3)
-00064 
-00065 #define DMXInputType           (1L<<0)
-00066 #define DMXInputPhysicalScreen (1L<<1)
-00067 #define DMXInputSendsCore      (1L<<2)
-00068 
-00069 #ifndef _DMX_SERVER_
-00070 
-00073 typedef struct {
-00074     char         *displayName;
-00075     int          logicalScreen;
-00076 
-00077     unsigned int screenWindowWidth;    /* displayName's coordinate system */
-00078     unsigned int screenWindowHeight;   /* displayName's coordinate system */
-00079     int          screenWindowXoffset;  /* displayName's coordinate system */
-00080     int          screenWindowYoffset;  /* displayName's coordinate system */
-00081 
-00082     unsigned int rootWindowWidth;      /* screenWindow's coordinate system */
-00083     unsigned int rootWindowHeight;     /* screenWindow's coordinate system */
-00084     int          rootWindowXoffset;    /* screenWindow's coordinate system */
-00085     int          rootWindowYoffset;    /* screenWindow's coordinate system */
-00086 
-00087     int          rootWindowXorigin;    /* global coordinate system */
-00088     int          rootWindowYorigin;    /* global coordinate system */
-00089 } DMXScreenAttributes;
-00090 
-00093 typedef struct {
-00094     int          screen;
-00095     Window       window;
-00096     XRectangle   pos, vis;
-00097 } DMXWindowAttributes;
-00098 
-00101 typedef struct {
-00102     unsigned int width;         /* global coordinate system */
-00103     unsigned int height;        /* global coordinate system */
-00104     int          shiftX;        /* global coordinate system */
-00105     int          shiftY;        /* global coordinate system */
-00106 } DMXDesktopAttributes;
-00107 
-00110 typedef enum {
-00111     DMXLocalInputType,
-00112     DMXConsoleInputType,
-00113     DMXBackendInputType
-00114 } DMXInputEnum;
-00115 
-00118 typedef struct {
-00119     DMXInputEnum inputType;
-00120     int          physicalScreen;
-00121     int          physicalId;
-00122     Bool         isCore;
-00123     Bool         sendsCore;
-00124     const char   *name;
-00125     Bool         detached;
-00126 } DMXInputAttributes;
-00127 
-00128 _XFUNCPROTOBEGIN
-00129 
-00130 extern Bool DMXQueryExtension(Display *dpy,
-00131                               int *event_basep, int *error_basep);
-00132 extern Bool DMXQueryVersion(Display *dpy, int *major_version,
-00133                             int *minor_version, int *patch_version);
-00134 extern Bool DMXSync(Display *dpy);
-00135 extern Bool DMXForceWindowCreation(Display *dpy, Window window);
-00136 
-00137 
-00138 extern Bool DMXGetScreenCount(Display *dpy, int *screen_count);
-00139 extern Bool DMXGetScreenAttributes(Display *dpy,
-00140                                    int screen,
-00141                                    DMXScreenAttributes *attr);
-00142 extern int  DMXChangeScreensAttributes(Display *dpy,
-00143                                        int screen_count,
-00144                                        int *screens,
-00145                                        int mask_count,
-00146                                        unsigned int *masks,
-00147                                        DMXScreenAttributes *attr, /* vector */
-00148                                        int *error_screen);
-00149 
-00150 extern Bool DMXAddScreen(Display *dpy,
-00151                          const char *displayName,
-00152                          unsigned int mask,
-00153                          DMXScreenAttributes *attr,
-00154                          int *screen);
-00155 extern Bool DMXRemoveScreen(Display *dpy, int screen);
-00156 
-00157 /* Call DMXGetScreenWindowCount and allocate info to that size.  Pass
-00158  * the size in available_count.  This call can generate a large amount
-00159  * of wire traffic and should not be used called with available_count=0
-00160  * just to determine the screen_count value -- use DMXGetScreenCount
-00161  * instead.  NOTE: Also see DMX protocol specification (DMXSpec.txt) for
-00162  * usage of DMXSync to flush pending commands. */
-00163 extern Bool DMXGetWindowAttributes(Display *dpy, Window window,
-00164                                    int *screen_count, int available_count,
-00165                                    DMXWindowAttributes *attr);
-00166 
-00167 extern Bool DMXGetDesktopAttributes(Display *dpy, DMXDesktopAttributes *attr);
-00168 extern int  DMXChangeDesktopAttributes(Display *dpy,
-00169                                        unsigned int mask,
-00170                                        DMXDesktopAttributes *attr);
-00171 
-00172 extern Bool DMXGetInputCount(Display *dpy, int *input_count);
-00173 extern Bool DMXGetInputAttributes(Display *dpy, int id,
-00174                                   DMXInputAttributes *attr);
-00175 
-00176 extern Bool DMXAddInput(Display *dpy,
-00177                         unsigned int mask,
-00178                         DMXInputAttributes *attr,
-00179                         int *id);
-00180 extern Bool DMXRemoveInput(Display *dpy, int id);
-00181 
-00182 /* These are helper functions that call DMXAddInput. */
-00183 extern Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore,
-00184                                int *newId);
-00185 extern Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
-00186                                int *newId);
-00187 
-00188 _XFUNCPROTOEND
-00189 #endif
-00190 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxext_8h.html b/xorg-server/hw/dmx/doc/html/dmxext_8h.html deleted file mode 100644 index eb143283f..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxext_8h.html +++ /dev/null @@ -1,926 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxext.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  DMXDesktopAttributes
struct  DMXInputAttributes
struct  DMXScreenAttributes
struct  DMXWindowAttributes

Enumerations

enum  DMXInputEnum

Functions

_XFUNCPROTOBEGIN Bool DMXQueryExtension (Display *dpy, int *event_basep, int *error_basep)
Bool DMXQueryVersion (Display *dpy, int *major_version, int *minor_version, int *patch_version)
Bool DMXSync (Display *dpy)
Bool DMXForceWindowCreation (Display *dpy, Window window)
Bool DMXGetScreenCount (Display *dpy, int *screen_count)
Bool DMXGetScreenAttributes (Display *dpy, int screen, DMXScreenAttributes *attr)
int DMXChangeScreensAttributes (Display *dpy, int screen_count, int *screens, int mask_count, unsigned int *masks, DMXScreenAttributes *attr, int *error_screen)
Bool DMXAddScreen (Display *dpy, const char *displayName, unsigned int mask, DMXScreenAttributes *attr, int *screen)
Bool DMXRemoveScreen (Display *dpy, int screen)
Bool DMXGetWindowAttributes (Display *dpy, Window window, int *screen_count, int available_count, DMXWindowAttributes *attr)
Bool DMXGetDesktopAttributes (Display *dpy, DMXDesktopAttributes *attr)
int DMXChangeDesktopAttributes (Display *dpy, unsigned int mask, DMXDesktopAttributes *attr)
Bool DMXGetInputCount (Display *dpy, int *input_count)
Bool DMXGetInputAttributes (Display *dpy, int id, DMXInputAttributes *attr)
Bool DMXAddInput (Display *dpy, unsigned int mask, DMXInputAttributes *attr, int *id)
Bool DMXRemoveInput (Display *dpy, int id)
Bool DMXAddBackendInput (Display *dpy, int screen, int sendsCore, int *newId)
Bool DMXAddConsoleInput (Display *dpy, const char *name, int sendsCore, int *newId)
-

Detailed Description

-This file describes the interface to the client-side libdmx.a library. All DMX-aware client-side applications should include this file.

Enumeration Type Documentation

-

- - - - -
- - -
enum DMXInputEnum -
-
- - - - - -
-   - - -

-Enumeration for the #inputType field in the DMXInputAttributes structure.

-

Function Documentation

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddBackendInput ( Display *  dpy,
int  screen,
int  sendsCore,
int *  newId
) 
-
- - - - - -
-   - - -

-Add backend input (a helper function that calls DMXAddInput).

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddConsoleInput ( Display *  dpy,
const char *  name,
int  sendsCore,
int *  newId
) 
-
- - - - - -
-   - - -

-Add console input (a helper function that calls DMXAddInput).

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddInput ( Display *  dpy,
unsigned int  mask,
DMXInputAttributes *  attr,
int *  id
) 
-
- - - - - -
-   - - -

-Add input.

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddScreen ( Display *  dpy,
const char *  displayName,
unsigned int  mask,
DMXScreenAttributes *  attr,
int *  screen
) 
-
- - - - - -
-   - - -

-Add a screen.

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
int DMXChangeDesktopAttributes ( Display *  dpy,
unsigned int  mask,
DMXDesktopAttributes *  attr
) 
-
- - - - - -
-   - - -

-Change the global bounding box and origin offset.

-Available in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int DMXChangeScreensAttributes ( Display *  dpy,
int  screen_count,
int *  screens,
int  mask_count,
unsigned int *  masks,
DMXScreenAttributes *  attrs,
int *  error_screen
) 
-
- - - - - -
-   - - -

-Change geometries and positions of the DMX screen and root windows on the back-end X server.

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXForceWindowCreation ( Display *  dpy,
Window  window
) 
-
- - - - - -
-   - - -

-The creation of the specified window will be forced.

-Available in DMX Protocol Version 1.2 Reply added in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetDesktopAttributes ( Display *  dpy,
DMXDesktopAttributes *  attr
) 
-
- - - - - -
-   - - -

-If the DMXGetDesktopAttributes protocol request returns information correctly, the information will be placed in attr, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetInputAttributes ( Display *  dpy,
int  id,
DMXInputAttributes *  inf
) 
-
- - - - - -
-   - - -

-If the DMXGetInputAttributes protocol request returns information about the input device with the specified id, information about the input device will be placed in inf, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.1

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetInputCount ( Display *  dpy,
int *  input_count
) 
-
- - - - - -
-   - - -

-If the DMXGetInputCount protocol request returns the input count, the value will be placed in input_count, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.1

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetScreenAttributes ( Display *  dpy,
int  physical_screen,
DMXScreenAttributes *  attr
) 
-
- - - - - -
-   - - -

-If the DMXGetScreenAttributes protocol request returns information for the specified physical_screen, information about the screen will be placed in attr, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0; Modified in Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetScreenCount ( Display *  dpy,
int *  screen_count
) 
-
- - - - - -
-   - - -

-If the DMXGetScreenCount protocol request returns the screen count, the value will be placed in screen_count, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetWindowAttributes ( Display *  dpy,
Window  window,
int *  screen_count,
int  available_count,
DMXWindowAttributes *  inf
) 
-
- - - - - -
-   - - -

-If the DMXGetWindowAttributes protocol request returns information about the specified window, the number of screens for which information is available will be returned in screen_count and information about the first available_count of those screens will be placed in inf. Because this call transports a great deal of information over the wire, please call DMXGetScreenCount first, and make sure inf is that large.

-Note that if the specified window has not yet been mapped when DMXGetWindowAttributes is called, then a subsequent XMapWindow call might be buffered in xlib while requests directly to the back-end X servers are processed. This race condition can be solved by calling DMXSync before talking directly to the back-end X servers.

-Available in DMX Protocol Version 1.0, but not working correctly until DMX Protocol Version 1.4

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
_XFUNCPROTOBEGIN Bool DMXQueryExtension ( Display *  dpy,
int *  event_basep,
int *  error_basep
) 
-
- - - - - -
-   - - -

-If the server has the DMX extension, the event and error bases will be placed in event_basep and error_basep, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXQueryVersion ( Display *  dpy,
int *  majorVersion,
int *  minorVersion,
int *  patchVersion
) 
-
- - - - - -
-   - - -

-If the DMXQueryVersion protocol request returns version information from the server, majorVersion, minorVersion, and patchVersion are filled in with the appropriate information and True is returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXRemoveInput ( Display *  dpy,
int  id
) 
-
- - - - - -
-   - - -

-Remove an input.

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXRemoveScreen ( Display *  dpy,
int  screen
) 
-
- - - - - -
-   - - -

-Remove a screen.

-

- - - - -
- - - - - - - - - - -
Bool DMXSync ( Display *  dpy  ) 
-
- - - - - -
-   - - -

-Flush all pending dmxSync requests in DMX server.

-Available in DMX Protocol Version 1.5

-

-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html index 6bcf8f133..fe4cbcd9c 100644 --- a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html @@ -6,419 +6,841 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxextension.c File Reference

#include "dmx.h"
-#include "dmxinit.h"
-#include "dmxextension.h"
-#include "dmxwindow.h"
-#include "dmxcb.h"
-#include "dmxcursor.h"
-#include "dmxpixmap.h"
-#include "dmxgc.h"
-#include "dmxfont.h"
-#include "dmxcmap.h"
-#include "dmxpict.h"
-#include "dmxinput.h"
-#include "dmxsync.h"
-#include "dmxscrinit.h"
-#include "input/dmxinputinit.h"
-#include "windowstr.h"
-#include "inputstr.h"
-#include "dmxproto.h"
-#include "cursorstr.h"
- - - - - - - - + + +
+

dmxextension.c File Reference

#include <stdlib.h>
+#include "dmx.h"
+#include "dmxinit.h"
+#include "dmxextension.h"
+#include "dmxwindow.h"
+#include "dmxcb.h"
+#include "dmxcursor.h"
+#include "dmxpixmap.h"
+#include "dmxgc.h"
+#include "dmxfont.h"
+#include "dmxcmap.h"
+#include "dmxpict.h"
+#include "dmxinput.h"
+#include "dmxsync.h"
+#include "dmxscrinit.h"
+#include "input/dmxinputinit.h"
+#include "windowstr.h"
+#include "inputstr.h"
+#include <X11/extensions/dmxproto.h>
+#include "cursorstr.h"
+

Functions

Bool dmxGetScreenAttributes (int physical, DMXScreenAttributesPtr attr)
Bool dmxGetWindowAttributes (WindowPtr pWindow, DMXWindowAttributesPtr attr)
int dmxGetInputCount (void)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Functions

Bool dmxGetScreenAttributes (int physical, DMXScreenAttributesPtr attr)
Bool dmxGetWindowAttributes (WindowPtr pWindow, DMXWindowAttributesPtr attr)
void dmxGetDesktopAttributes (DMXDesktopAttributesPtr attr)
int dmxGetInputCount (void)
int dmxGetInputAttributes (int deviceId, DMXInputAttributesPtr attr)
static void dmxAdjustCursorBoundaries (void)
int dmxAddInput (DMXInputAttributesPtr attr, int *id)
int dmxRemoveInput (int id)
unsigned long dmxGetNumScreens (void)
void dmxForceWindowCreation (WindowPtr pWindow)
void dmxFlushPendingSyncs (void)
void dmxUpdateScreenResources (ScreenPtr pScreen, int x, int y, int w, int h)
static void dmxBECreateScratchGCs (int scrnNum)
static void dmxBERestorePixmap (PixmapPtr pPixmap)
static void dmxBECreateResources (pointer value, XID id, RESTYPE type, pointer n)
static void dmxBECreateWindowTree (int idx)
static void dmxForceExposures (int idx)
static Bool dmxCompareScreens (DMXScreenInfo *new, DMXScreenInfo *old)
static void dmxBERestoreRenderPict (pointer value, XID id, pointer n)
static void dmxBERestoreRenderGlyph (pointer value, XID id, pointer n)
int dmxAttachScreen (int idx, DMXScreenAttributesPtr attr)
static void dmxBESavePixmap (PixmapPtr pPixmap)
static void dmxBEDestroyResources (pointer value, XID id, RESTYPE type, pointer n)
static void dmxBEDestroyScratchGCs (int scrnNum)
static void dmxBEDestroyWindowTree (int idx)
int dmxDetachScreen (int idx)

Variables

FontPtr defaultFont
+

Detailed Description

+

This file provides the only interface to the X server extension support in programs/Xserver/Xext. Those programs should only include dmxext.h

+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
int dmxAddInput (DMXInputAttributesPtr  attr,
int *  id 
)
+
+
+

Add an input with the specified attributes. If the input is added, the physical id is returned in deviceId.

-int dmxGetInputAttributes (int deviceId, DMXInputAttributesPtr attr) +

References dmxAdjustCursorBoundaries(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxSync(), DMXInputAttributesRec::inputType, DMXInputAttributesRec::name, DMXInputAttributesRec::physicalScreen, and DMXInputAttributesRec::sendsCore.

-int dmxAddInput (DMXInputAttributesPtr attr, int *id) +

Referenced by ProcDMXAddInput().

-int dmxRemoveInput (int id) +
+
+ +
+
+ + + + + + + + + +
static void dmxAdjustCursorBoundaries (void  )  [static]
+
+
+

Reinitialized the cursor boundaries.

-unsigned long dmxGetNumScreens (void) +

References _DMXInputInfo::detached, DMX_NO_RECOMPUTE_BOUNDING_BOX, dmxCheckCursor(), dmxComputeWidthHeight(), dmxConnectionBlockCallback(), dmxInitOverlap(), dmxInputLateReInit(), dmxInputReInit(), dmxInputs, dmxNumInputs, and dmxReInitOrigins().

-void dmxForceWindowCreation (WindowPtr pWindow) +

Referenced by dmxAddInput(), and dmxDetachScreen().

-void dmxFlushPendingSyncs (void) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int dmxAttachScreen (int  idx,
DMXScreenAttributesPtr  attr 
)
+
+
+

Reattach previously detached back-end screen.

-int dmxAttachScreen (int idx, DMXScreenAttributesPtr attr) +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, defaultFont, DMXScreenAttributesRec::displayName, dmxAddRemoveScreens, dmxBECreatePixmap(), dmxBECreateResources(), dmxBECreateScratchGCs(), dmxBECreateWindowTree(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBERestoreRenderPict(), dmxBEScreenInit(), dmxCheckForWM(), dmxCompareScreens(), dmxConfigureScreenWindows(), dmxForceExposures(), dmxGetColormaps(), dmxGetPixmapFormats(), dmxGetScreenAttribs(), dmxGetVisualInfo(), dmxLog(), dmxLogOutput(), dmxOpenDisplay(), dmxScreens, dmxSetErrorHandler(), dmxSync(), dmxWarning, and _DMXScreenInfo::name.

-int dmxDetachScreen (int idx) +

Referenced by ProcDMXAddScreen().

- -

Detailed Description

-This file provides the only interface to the X server extension support in programs/Xserver/Xext. Those programs should only include dmxext.h

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + + + + + + + + + + + + - - + + - - + + +
int dmxAddInput ( DMXInputAttributesPtr  attr, static void dmxBECreateResources (pointer  value,
XID  id,
RESTYPE  type,
int *  idpointer  n 
) ) [static]
+ +
+

Create resources on the back-end server. This function is called from dmxAttachScreen() via the dix layer's FindAllResources function. It walks all resources, compares them to the screen number passed in as n and calls the appropriate DMX function to create the associated resource on the back-end server.

+ +

References defaultFont, dmxBECreateColormap(), dmxBECreateCursor(), dmxBECreateGC(), dmxBECreatePixmap(), dmxBEFreeGlyphSet(), dmxBELoadFont(), dmxBERestorePixmap(), and dmxChangeGC().

+ +

Referenced by dmxAttachScreen().

+
+ + +
+
+ + + + + + + + +
static void dmxBECreateScratchGCs (int  scrnNum )  [static]
-
- - - - - -
-   - - -

-Add an input with the specified attributes. If the input is added, the physical id is returned in deviceId.

-

- - - - -
- + +
+

Create the scratch GCs per depth.

+ +

References dmxBECreateGC().

+ +

Referenced by dmxAttachScreen().

+ +
+ + +
+
+
+ + + + + + + + +
static void dmxBECreateWindowTree (int  idx )  [static]
+ +
+

Create window hierachy on back-end server. The window tree is created in a special order (bottom most subwindow first) so that the dmxCreateNonRootWindow() function does not need to recursively call itself to create each window's parents. This is required so that we have the opportunity to create each window's border and background pixmaps (where appropriate) before the window is created.

+ +

References _DMXScreenInfo::beDisplay, _dmxWinPriv::cmap, DMX_GET_WINDOW_PRIV, dmxBECreatePixmap(), dmxBERestorePixmap(), dmxCreateAndRealizeWindow(), dmxCreateRootWindow(), dmxGetDefaultWindowAttributes(), dmxScreens, _dmxWinPriv::mapped, _dmxWinPriv::offscreen, _DMXScreenInfo::rootWin, _dmxWinPriv::visual, and _dmxWinPriv::window.

+ +

Referenced by dmxAttachScreen().

+ +
+ + +
+
+ - - - - + + + + + + + + + + - - + + + - - + + + + + + + -
int dmxAttachScreen ( int  idx, static void dmxBEDestroyResources (pointer  value,
XID  id,
DMXScreenAttributesPtr  attrRESTYPE  type,
) pointer  n 
) [static]
-
- - - - - -
-   - - -

-Reattach previously detached back-end screen.

-

- - - - -
- + +
+

Destroy resources on the back-end server. This function is called from dmxDetachScreen() via the dix layer's FindAllResources function. It walks all resources, compares them to the screen number passed in as n and calls the appropriate DMX function to free the associated resource on the back-end server.

+ +

References dmxBEFreeColormap(), dmxBEFreeCursor(), dmxBEFreeFont(), dmxBEFreeGC(), dmxBEFreeGlyphSet(), dmxBEFreePicture(), dmxBEFreePixmap(), and dmxBESavePixmap().

+ +

Referenced by dmxDetachScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + +
int dmxDetachScreen ( int  idx  ) static void dmxBEDestroyScratchGCs (int  scrnNum )  [static]
+ +
+

Destroy the scratch GCs that are created per depth.

+

References dmxBEFreeGC().

+ +

Referenced by dmxDetachScreen().

+ +
+ + +
+
+ + + + + + + + +
static void dmxBEDestroyWindowTree (int  idx )  [static]
-
- - - - - -
-   - - -

-Detach back-end screen.

-

- - - - -
- + +
+

Destroy window hierachy on back-end server. To ensure that all XDestroyWindow() calls succeed, they must be performed in a bottom up order so that windows are not destroyed before their children. XDestroyWindow(), which is called from dmxBEDestroyWindow(), will destroy a window as well as all of it's children.

+ +

References dmxBEDestroyWindow(), dmxBEFreePixmap(), and dmxBESavePixmap().

+ +

Referenced by dmxDetachScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxFlushPendingSyncs ( void   ) static void dmxBERestorePixmap (PixmapPtr  pPixmap )  [static]
+ +
+

Restore the pixmap image either from another screen or from an image that was saved when the screen was previously detached.

+ +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, dmxLog(), dmxScreens, dmxWarning, _dmxPixPriv::pixmap, and _DMXScreenInfo::scrnDefDrawables.

+ +

Referenced by dmxAttachScreen(), dmxBECreateResources(), dmxBECreateWindowTree(), and dmxBERestoreRenderPict().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static void dmxBERestoreRenderGlyph (pointer  value,
XID  id,
pointer  n 
) [static]
-
- - - - - -
-   - - -

-Flush pending syncs for all screens.

-

- - - - -
- + +
+

Restore Render's glyphs

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxBECreateGlyphSet(), dmxLog(), dmxScreens, dmxWarning, _dmxGlyphPriv::glyphSets, and pos.

+ +

Referenced by dmxAttachScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + +
void dmxForceWindowCreation ( WindowPtr  pWindow  ) static void dmxBERestoreRenderPict (pointer  value,
XID  id,
pointer  n 
) [static]
+ +
+

Restore Render's picture

+ +

References dmxBECreatePicture(), dmxBECreatePixmap(), and dmxBERestorePixmap().

+ +

Referenced by dmxAttachScreen().

+
+ + +
+
+ + + + + + + + +
static void dmxBESavePixmap (PixmapPtr  pPixmap )  [static]
-
- - - - - -
-   - - -

-Make sure that dmxCreateAndRealizeWindow has been called for pWindow.

-

- - - - -
- + +
+

Save the pixmap image only when there is not another screen with that pixmap from which the image can be read when the screen is reattached. To do this, we first try to find a pixmap on another screen corresponding to the one we are trying to save. If we find one, then we do not need to save the image data since during reattachment, the image data can be read from that other pixmap. However, if we do not find one, then we need to save the image data. The common case for these are for the default stipple and root tile.

+ +

References _DMXScreenInfo::beDisplay, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, dmxLog(), dmxScreens, dmxWarning, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxBEDestroyResources(), dmxBEDestroyWindowTree(), and dmxDetachScreen().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + +
int dmxGetInputAttributes ( int  deviceId, static Bool dmxCompareScreens (DMXScreenInfo *  new,
DMXInputAttributesPtr  attrDMXScreenInfo *  old 
) ) [static]
+ +
+

Compare the new and old screens to see if they are compatible.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDepth, _DMXScreenInfo::beDepths, _DMXScreenInfo::beHeight, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, and _DMXScreenInfo::beWidth.

+

Referenced by dmxAttachScreen().

+ +
+ + +
+
+ + + + + + + + +
int dmxDetachScreen (int  idx ) 
-
- - - - - -
-   - - -

-Return information about the device with id = deviceId. This information is primarily for the ProcDMXGetInputAttributes() function, which does not have access to the appropriate data structure.

-

- - - - -
- + +
+

Detach back-end screen.

+ +

References _DMXScreenInfo::beDisplay, dmxAddRemoveScreens, dmxAdjustCursorBoundaries(), dmxBECloseScreen(), dmxBEDestroyResources(), dmxBEDestroyScratchGCs(), dmxBEDestroyWindowTree(), dmxBEFreePixmap(), dmxBESavePixmap(), dmxInputDetachAll(), dmxLog(), dmxLogOutput(), dmxScreens, and dmxWarning.

+ +

Referenced by ProcDMXRemoveScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + +
int dmxGetInputCount ( void   ) void dmxFlushPendingSyncs (void  ) 
+ +
+

Flush pending syncs for all screens.

+ +

References dmxSync().

+ +

Referenced by ProcDMXForceWindowCreation(), ProcDMXGetWindowAttributes(), and ProcDMXSync().

+
+ + +
+
+ + + + + + + + +
static void dmxForceExposures (int  idx )  [static]
-
- - - - - -
-   - - -

-Return the total number of devices, not just dmxNumInputs. The number returned should be the same as that returned by XListInputDevices.

-

- - - - -
- + +
+ +

Referenced by dmxAttachScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + +
unsigned long dmxGetNumScreens ( void   ) void dmxForceWindowCreation (WindowPtr  pWindow ) 
+ +
+

Make sure that dmxCreateAndRealizeWindow has been called for pWindow.

+ +

References DMX_GET_WINDOW_PRIV, dmxCreateAndRealizeWindow(), and _dmxWinPriv::window.

+ +

Referenced by ProcDMXForceWindowCreation().

+
+ + +
+
+ + + + + + + + +
void dmxGetDesktopAttributes (DMXDesktopAttributesPtr  attr ) 
-
- - - - - -
-   - - -

-Return the value of dmxNumScreens -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).

-

- - - - -
- + +
+ +

References dmxGlobalHeight, dmxGlobalWidth, DMXDesktopAttributesRec::height, DMXDesktopAttributesRec::shiftX, DMXDesktopAttributesRec::shiftY, and DMXDesktopAttributesRec::width.

+ +

Referenced by ProcDMXChangeDesktopAttributes(), and ProcDMXGetDesktopAttributes().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
Bool dmxGetScreenAttributes ( int  physical, int dmxGetInputAttributes (int  deviceId,
DMXInputAttributesPtr  attr 
DMXScreenAttributesPtr  attr)
+ +
+

Return information about the device with id = deviceId. This information is primarily for the ProcDMXGetInputAttributes() function, which does not have access to the appropriate data structure.

+ +

References _DMXInputInfo::detached, DMXInputAttributesRec::detached, _DMXLocalInputInfo::deviceId, _DMXInputInfo::devs, DMX_LOCAL_TYPE_BACKEND, DMX_LOCAL_TYPE_COMMON, DMX_LOCAL_TYPE_CONSOLE, DMX_LOCAL_TYPE_LOCAL, dmxInputs, dmxNumInputs, _DMXLocalInputInfo::extType, DMXInputAttributesRec::inputType, _DMXLocalInputInfo::isCore, DMXInputAttributesRec::isCore, _DMXInputInfo::name, DMXInputAttributesRec::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, DMXInputAttributesRec::physicalId, DMXInputAttributesRec::physicalScreen, _DMXInputInfo::scrnIdx, _DMXLocalInputInfo::sendsCore, and DMXInputAttributesRec::sendsCore.

+ +

Referenced by ProcDMXGetInputAttributes().

+ +
+ + +
+
+ + + + + + - - +
int dmxGetInputCount (void  )  ) 
+
+
+

Return the total number of devices, not just dmxNumInputs. The number returned should be the same as that returned by XListInputDevices.

+

References dmxInputs, and dmxNumInputs.

+ +

Referenced by dmxInputLogDevices(), and ProcDMXGetInputCount().

+ +
+
+ +
+
+ + + + + + + + +
unsigned long dmxGetNumScreens (void  ) 
-
- - - - - -
-   - - -

-This routine provides information to the DMX protocol extension about a particular screen.

-

- - - - -
- + +
+

Return the value of dmxNumScreens -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).

+ +

References dmxNumScreens.

+ +

Referenced by ProcDMXGetScreenAttributes(), and ProcDMXGetScreenCount().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
Bool dmxGetWindowAttributes ( WindowPtr  pWindow, Bool dmxGetScreenAttributes (int  physical,
DMXScreenAttributesPtr  attr 
DMXWindowAttributesPtr  attr)
+ +
+

This routine provides information to the DMX protocol extension about a particular screen.

+ +

References DMXScreenAttributesRec::displayName, dmxNumScreens, dmxScreens, _DMXScreenInfo::index, DMXScreenAttributesRec::logicalScreen, _DMXScreenInfo::name, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, DMXScreenAttributesRec::rootWindowHeight, DMXScreenAttributesRec::rootWindowWidth, DMXScreenAttributesRec::rootWindowXoffset, DMXScreenAttributesRec::rootWindowXorigin, DMXScreenAttributesRec::rootWindowYoffset, DMXScreenAttributesRec::rootWindowYorigin, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, DMXScreenAttributesRec::screenWindowHeight, DMXScreenAttributesRec::screenWindowWidth, DMXScreenAttributesRec::screenWindowXoffset, DMXScreenAttributesRec::screenWindowYoffset, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by ProcDMXAddScreen(), ProcDMXChangeScreensAttributes(), and ProcDMXGetScreenAttributes().

+ +
+ + +
+
+ + + + + + + + - - + + + + + + + +
Bool dmxGetWindowAttributes (WindowPtr  pWindow,
) DMXWindowAttributesPtr  attr 
)
+
+
+

This routine provides information to the DMX protocol extension about a particular window.

+

References DMX_GET_WINDOW_PRIV, _dmxWinPriv::offscreen, DMXWindowAttributesRec::pos, DMXWindowAttributesRec::screen, DMXWindowAttributesRec::vis, _dmxWinPriv::window, and DMXWindowAttributesRec::window.

+ +

Referenced by dmxPopulate().

+ +
+
+ +
+
+ + + + + + + + +
int dmxRemoveInput (int  id ) 
-
- - - - - -
-   - - -

-This routine provides information to the DMX protocol extension about a particular window.

-

- - - - -
- + +
+

Remove the input with physical id id.

+ +

References dmxInputDetachId().

+ +

Referenced by ProcDMXRemoveInput().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxUpdateScreenResources (ScreenPtr  pScreen,
int dmxRemoveInput ( int  id  ) int  x,
int  y,
int  w,
int  h 
)
+ +
+

Update DMX's screen resources to match those of the newly moved and/or resized "root" window.

+ +

References _DMXScreenInfo::beXDPI, _DMXScreenInfo::beYDPI, and dmxScreens.

+ +

Referenced by dmxCreateWindow().

+
+ +

Variable Documentation

+ +
+
+ + + +
FontPtr defaultFont
-
- - - - - -
-   - - -

-Remove the input with physical id id.

+

+
+ +

Referenced by dmxAttachScreen(), and dmxBECreateResources().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html deleted file mode 100644 index 4fd796af5..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxextension.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Author:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *   Kevin E. Martin <kem@redhat.com>
-00033  *
-00034  */
-00035 
-00040 #ifndef _DMXEXTENSION_H_
-00041 #define _DMXEXTENSION_H_
-00042 
-00045 typedef struct {
-00046     const char   *displayName;
-00047     int          logicalScreen;
-00048 
-00049     unsigned int screenWindowWidth;    /* displayName's coordinate system */
-00050     unsigned int screenWindowHeight;   /* displayName's coordinate system */
-00051     int          screenWindowXoffset;  /* displayName's coordinate system */
-00052     int          screenWindowYoffset;  /* displayName's coordinate system */
-00053 
-00054     unsigned int rootWindowWidth;      /* screenWindow's coordinate system */
-00055     unsigned int rootWindowHeight;     /* screenWindow's coordinate system */
-00056     int          rootWindowXoffset;    /* screenWindow's coordinate system */
-00057     int          rootWindowYoffset;    /* screenWindow's coordinate system */
-00058 
-00059     int          rootWindowXorigin;    /* global coordinate system */
-00060     int          rootWindowYorigin;    /* global coordinate system */
-00061 } DMXScreenAttributesRec, *DMXScreenAttributesPtr;
-00062 
-00064 typedef struct {
-00065     int          screen;
-00066     Window       window;
-00067     xRectangle   pos;
-00068     xRectangle   vis;
-00069 } DMXWindowAttributesRec, *DMXWindowAttributesPtr;
-00070 
-00073 typedef struct {
-00074     int          width;
-00075     int          height;
-00076     int          shiftX;
-00077     int          shiftY;
-00078 } DMXDesktopAttributesRec, *DMXDesktopAttributesPtr;
-00079 
-00081 typedef struct {
-00082     const char   *name;
-00083     int          inputType;
-00084     int          physicalScreen;
-00085     int          physicalId;
-00086     int          isCore;
-00087     int          sendsCore;
-00088     int          detached;
-00089 } DMXInputAttributesRec, *DMXInputAttributesPtr;
-00090 
-00091 
-00092 extern unsigned long dmxGetNumScreens(void);
-00093 extern void          dmxForceWindowCreation(WindowPtr pWindow);
-00094 extern void          dmxFlushPendingSyncs(void);
-00095 extern Bool          dmxGetScreenAttributes(int physical,
-00096                                             DMXScreenAttributesPtr attr);
-00097 extern Bool          dmxGetWindowAttributes(WindowPtr pWindow,
-00098                                             DMXWindowAttributesPtr attr);
-00099 extern void          dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr);
-00100 extern int           dmxGetInputCount(void);
-00101 extern int           dmxGetInputAttributes(int deviceId,
-00102                                            DMXInputAttributesPtr attr);
-00103 extern int           dmxAddInput(DMXInputAttributesPtr attr, int *deviceId);
-00104 extern int           dmxRemoveInput(int deviceId);
-00105 
-00106 extern int           dmxConfigureScreenWindows(int nscreens,
-00107                                                CARD32 *screens,
-00108                                                DMXScreenAttributesPtr attribs,
-00109                                                int *errorScreen);
-00110 
-00111 extern int           dmxConfigureDesktop(DMXDesktopAttributesPtr attribs);
-00112 
-00113 /* dmxUpdateScreenResources exposed for dmxCreateWindow in dmxwindow.c */
-00114 extern void          dmxUpdateScreenResources(ScreenPtr pScreen,
-00115                                               int x, int y, int w, int h);
-00116 
-00117 extern int           dmxAttachScreen(int idx, DMXScreenAttributesPtr attr);
-00118 extern int           dmxDetachScreen(int idx);
-00119 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html index 41cdcd3eb..7e0167c36 100644 --- a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html @@ -6,412 +6,546 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxextension.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Data Structures

struct  DMXDesktopAttributesRec
struct  DMXInputAttributesRec
struct  DMXScreenAttributesRec
struct  DMXWindowAttributesRec

Functions

unsigned long dmxGetNumScreens (void)
void dmxForceWindowCreation (WindowPtr pWindow)
void dmxFlushPendingSyncs (void)
Bool dmxGetScreenAttributes (int physical, DMXScreenAttributesPtr attr)
+ + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  DMXScreenAttributesRec
struct  DMXWindowAttributesRec
struct  DMXDesktopAttributesRec
struct  DMXInputAttributesRec

Typedefs

typedef struct
+DMXScreenAttributesRec * 		DMXScreenAttributesPtr
typedef struct
+DMXWindowAttributesRec * 		DMXWindowAttributesPtr
typedef struct
+DMXDesktopAttributesRec * 		DMXDesktopAttributesPtr
typedef struct
+DMXInputAttributesRec * 		DMXInputAttributesPtr

Functions

unsigned long dmxGetNumScreens (void)
void dmxForceWindowCreation (WindowPtr pWindow)
void dmxFlushPendingSyncs (void)
Bool dmxGetScreenAttributes (int physical, DMXScreenAttributesPtr attr)
Bool dmxGetWindowAttributes (WindowPtr pWindow, DMXWindowAttributesPtr attr)
void dmxGetDesktopAttributes (DMXDesktopAttributesPtr attr)
int dmxGetInputCount (void)
int dmxGetInputAttributes (int deviceId, DMXInputAttributesPtr attr)
int dmxAddInput (DMXInputAttributesPtr attr, int *deviceId)
int dmxRemoveInput (int deviceId)
int dmxConfigureScreenWindows (int nscreens, CARD32 *screens, DMXScreenAttributesPtr attribs, int *errorScreen)
int dmxConfigureDesktop (DMXDesktopAttributesPtr attribs)
void dmxUpdateScreenResources (ScreenPtr pScreen, int x, int y, int w, int h)
int dmxAttachScreen (int idx, DMXScreenAttributesPtr attr)
int dmxDetachScreen (int idx)
+

Detailed Description

+

Interface for DMX extension support. These routines are called by function in Xserver/Xext/dmx.c.

+
See also:
dmxextension.c
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct DMXDesktopAttributesRec * DMXDesktopAttributesPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct DMXInputAttributesRec * DMXInputAttributesPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct DMXScreenAttributesRec * DMXScreenAttributesPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct DMXWindowAttributesRec * DMXWindowAttributesPtr
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
int dmxAddInput (DMXInputAttributesPtr  attr,
int *  id 
)
+
+
+

Add an input with the specified attributes. If the input is added, the physical id is returned in deviceId.

-Bool dmxGetWindowAttributes (WindowPtr pWindow, DMXWindowAttributesPtr attr) +

References dmxAdjustCursorBoundaries(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxSync(), DMXInputAttributesRec::inputType, DMXInputAttributesRec::name, DMXInputAttributesRec::physicalScreen, and DMXInputAttributesRec::sendsCore.

-int dmxGetInputCount (void) +

Referenced by ProcDMXAddInput().

-int dmxGetInputAttributes (int deviceId, DMXInputAttributesPtr attr) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int dmxAttachScreen (int  idx,
DMXScreenAttributesPtr  attr 
)
+
+
+

Reattach previously detached back-end screen.

-int dmxAddInput (DMXInputAttributesPtr attr, int *deviceId) +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, defaultFont, DMXScreenAttributesRec::displayName, dmxAddRemoveScreens, dmxBECreatePixmap(), dmxBECreateResources(), dmxBECreateScratchGCs(), dmxBECreateWindowTree(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBERestoreRenderPict(), dmxBEScreenInit(), dmxCheckForWM(), dmxCompareScreens(), dmxConfigureScreenWindows(), dmxForceExposures(), dmxGetColormaps(), dmxGetPixmapFormats(), dmxGetScreenAttribs(), dmxGetVisualInfo(), dmxLog(), dmxLogOutput(), dmxOpenDisplay(), dmxScreens, dmxSetErrorHandler(), dmxSync(), dmxWarning, and _DMXScreenInfo::name.

-int dmxRemoveInput (int deviceId) +

Referenced by ProcDMXAddScreen().

-int dmxAttachScreen (int idx, DMXScreenAttributesPtr attr) +
+
+ +
+
+ + + + + + + + + +
int dmxConfigureDesktop (DMXDesktopAttributesPtr  attribs ) 
+
+
-int dmxDetachScreen (int idx) +

Referenced by ProcDMXChangeDesktopAttributes().

- -

Detailed Description

-Interface for DMX extension support. These routines are called by function in Xserver/Xext/dmx.c.
See also:
dmxextension.c
-

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - + + - -
int dmxAddInput ( DMXInputAttributesPtr  attr, int dmxConfigureScreenWindows (int  nscreens,
int *  idCARD32 *  screens,
) DMXScreenAttributesPtr  attribs,
-
- - - - - -
-   - - -

-Add an input with the specified attributes. If the input is added, the physical id is returned in deviceId.

-

- - - - -
- - - - - + + + + - - - + + +
int dmxAttachScreen ( int  idx, int *  errorScreen 
DMXScreenAttributesPtr  attr)
+ +
+ +

Referenced by dmxAttachScreen(), and ProcDMXChangeScreensAttributes().

+ +
+ + +
+
+ + + + + + - - -
int dmxDetachScreen (int  idx )  ) 
-
- - - - - -
-   - - -

-Reattach previously detached back-end screen.

-

- - - - -
- + +
+

Detach back-end screen.

+ +

References _DMXScreenInfo::beDisplay, dmxAddRemoveScreens, dmxAdjustCursorBoundaries(), dmxBECloseScreen(), dmxBEDestroyResources(), dmxBEDestroyScratchGCs(), dmxBEDestroyWindowTree(), dmxBEFreePixmap(), dmxBESavePixmap(), dmxInputDetachAll(), dmxLog(), dmxLogOutput(), dmxScreens, and dmxWarning.

+ +

Referenced by ProcDMXRemoveScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxDetachScreen ( int  idx  ) void dmxFlushPendingSyncs (void  ) 
-
- - - - - -
-   - - -

-Detach back-end screen.

-

- - - - -
- + +
+

Flush pending syncs for all screens.

+ +

References dmxSync().

+ +

Referenced by ProcDMXForceWindowCreation(), ProcDMXGetWindowAttributes(), and ProcDMXSync().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxFlushPendingSyncs ( void   ) void dmxForceWindowCreation (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Flush pending syncs for all screens.

-

- - - - -
- + +
+

Make sure that dmxCreateAndRealizeWindow has been called for pWindow.

+ +

References DMX_GET_WINDOW_PRIV, dmxCreateAndRealizeWindow(), and _dmxWinPriv::window.

+ +

Referenced by ProcDMXForceWindowCreation().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxForceWindowCreation ( WindowPtr  pWindow  ) void dmxGetDesktopAttributes (DMXDesktopAttributesPtr  attr ) 
-
- - - - - -
-   - - -

-Make sure that dmxCreateAndRealizeWindow has been called for pWindow.

-

- - - - -
- + +
+ +

References dmxGlobalHeight, dmxGlobalWidth, DMXDesktopAttributesRec::height, DMXDesktopAttributesRec::shiftX, DMXDesktopAttributesRec::shiftY, and DMXDesktopAttributesRec::width.

+ +

Referenced by ProcDMXChangeDesktopAttributes(), and ProcDMXGetDesktopAttributes().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxGetInputAttributes ( int  deviceId, int dmxGetInputAttributes (int  deviceId,
DMXInputAttributesPtr  attrDMXInputAttributesPtr  attr 
) )
-
- - - - - -
-   - - -

-Return information about the device with id = deviceId. This information is primarily for the ProcDMXGetInputAttributes() function, which does not have access to the appropriate data structure.

-

- - - - -
- + +
+

Return information about the device with id = deviceId. This information is primarily for the ProcDMXGetInputAttributes() function, which does not have access to the appropriate data structure.

+ +

References _DMXInputInfo::detached, DMXInputAttributesRec::detached, _DMXLocalInputInfo::deviceId, _DMXInputInfo::devs, DMX_LOCAL_TYPE_BACKEND, DMX_LOCAL_TYPE_COMMON, DMX_LOCAL_TYPE_CONSOLE, DMX_LOCAL_TYPE_LOCAL, dmxInputs, dmxNumInputs, _DMXLocalInputInfo::extType, DMXInputAttributesRec::inputType, _DMXLocalInputInfo::isCore, DMXInputAttributesRec::isCore, _DMXInputInfo::name, DMXInputAttributesRec::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, DMXInputAttributesRec::physicalId, DMXInputAttributesRec::physicalScreen, _DMXInputInfo::scrnIdx, _DMXLocalInputInfo::sendsCore, and DMXInputAttributesRec::sendsCore.

+ +

Referenced by ProcDMXGetInputAttributes().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxGetInputCount ( void   ) int dmxGetInputCount (void  ) 
-
- - - - - -
-   - - -

-Return the total number of devices, not just dmxNumInputs. The number returned should be the same as that returned by XListInputDevices.

-

- - - - -
- + +
+

Return the total number of devices, not just dmxNumInputs. The number returned should be the same as that returned by XListInputDevices.

+ +

References dmxInputs, and dmxNumInputs.

+ +

Referenced by dmxInputLogDevices(), and ProcDMXGetInputCount().

+ +
+ + +
+
+
- - - - - - + + + + + + -
unsigned long dmxGetNumScreens ( void   ) unsigned long dmxGetNumScreens (void  ) 
-
- - - - - -
-   - - -

-Return the value of dmxNumScreens -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).

-

- - - - -
- + +
+

Return the value of dmxNumScreens -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).

+ +

References dmxNumScreens.

+ +

Referenced by ProcDMXGetScreenAttributes(), and ProcDMXGetScreenCount().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
Bool dmxGetScreenAttributes ( int  physical, Bool dmxGetScreenAttributes (int  physical,
DMXScreenAttributesPtr  attr 
DMXScreenAttributesPtr  attr)
+ +
+

This routine provides information to the DMX protocol extension about a particular screen.

+ +

References DMXScreenAttributesRec::displayName, dmxNumScreens, dmxScreens, _DMXScreenInfo::index, DMXScreenAttributesRec::logicalScreen, _DMXScreenInfo::name, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, DMXScreenAttributesRec::rootWindowHeight, DMXScreenAttributesRec::rootWindowWidth, DMXScreenAttributesRec::rootWindowXoffset, DMXScreenAttributesRec::rootWindowXorigin, DMXScreenAttributesRec::rootWindowYoffset, DMXScreenAttributesRec::rootWindowYorigin, _DMXScreenInfo::rootX, _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootY, _DMXScreenInfo::rootYOrigin, DMXScreenAttributesRec::screenWindowHeight, DMXScreenAttributesRec::screenWindowWidth, DMXScreenAttributesRec::screenWindowXoffset, DMXScreenAttributesRec::screenWindowYoffset, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, and _DMXScreenInfo::scrnY.

+ +

Referenced by ProcDMXAddScreen(), ProcDMXChangeScreensAttributes(), and ProcDMXGetScreenAttributes().

+ +
+ + +
+
+ + + + + + + + - - + + + + + + + +
Bool dmxGetWindowAttributes (WindowPtr  pWindow,
) DMXWindowAttributesPtr  attr 
)
+
+
+

This routine provides information to the DMX protocol extension about a particular window.

+ +

References DMX_GET_WINDOW_PRIV, _dmxWinPriv::offscreen, DMXWindowAttributesRec::pos, DMXWindowAttributesRec::screen, DMXWindowAttributesRec::vis, _dmxWinPriv::window, and DMXWindowAttributesRec::window.

+

Referenced by dmxPopulate().

+ +
+
+ +
+
+ + + + + + + + +
int dmxRemoveInput (int  id ) 
-
- - - - - -
-   - - -

-This routine provides information to the DMX protocol extension about a particular screen.

-

- - - - -
- + +
+

Remove the input with physical id id.

+ +

References dmxInputDetachId().

+ +

Referenced by ProcDMXRemoveInput().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + - - + + - -
Bool dmxGetWindowAttributes ( WindowPtr  pWindow, void dmxUpdateScreenResources (ScreenPtr  pScreen,
int  x,
DMXWindowAttributesPtr  attrint  y,
) int  w,
-
- - - - - -
-   - - -

-This routine provides information to the DMX protocol extension about a particular window.

-

- - - - -
- - - - - - - + + + + + + + + + -
int dmxRemoveInput ( int  id  ) int  h 
)
-
- - - - - -
-   - - -

-Remove the input with physical id id.

+

+
+

Update DMX's screen resources to match those of the newly moved and/or resized "root" window.

+ +

References _DMXScreenInfo::beXDPI, _DMXScreenInfo::beYDPI, and dmxScreens.

+ +

Referenced by dmxCreateWindow().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html new file mode 100644 index 000000000..b2cd168ec --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html @@ -0,0 +1,144 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8c.html b/xorg-server/hw/dmx/doc/html/dmxfont_8c.html index b1c6c9f87..b1768ae01 100644 --- a/xorg-server/hw/dmx/doc/html/dmxfont_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxfont_8c.html @@ -6,243 +6,453 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxfont.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxfont.h"
-#include "dmxlog.h"
-#include "fontstruct.h"
-#include "dixfont.h"
-#include "dixstruct.h"
- - - - + + +
+

dmxfont.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxfont.h"
+#include "dmxlog.h"
+#include <X11/fonts/fontstruct.h>
+#include "dixfont.h"
+#include "dixstruct.h"
+

Functions

void dmxInitFonts (void)
+ + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_FONTPATH_DEBUG   0

Functions

static int dmxFontErrorHandler (Display *dpy, XErrorEvent *ev)
static char ** dmxGetFontPath (int *npaths)
static void dmxFreeFontPath (char **fp)
static Bool dmxCheckFontPathElement (DMXScreenInfo *dmxScreen, char *fp)
static int dmxSetFontPath (DMXScreenInfo *dmxScreen)
static int dmxCheckFontPath (DMXScreenInfo *dmxScreen, int *error)
static int dmxProcSetFontPath (ClientPtr client)
void dmxInitFonts (void)
void dmxResetFonts (void)
Bool dmxBELoadFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxRealizeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxBEFreeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxUnrealizeFont (ScreenPtr pScreen, FontPtr pFont)

Variables

static int(* dmxSaveProcVector [256])(ClientPtr)
static int dmxFontLastError
+

Detailed Description

+

This file provides support for fonts.

+

Define Documentation

+ +
+
+ + + + +
#define DMX_FONTPATH_DEBUG   0
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
Bool dmxBEFreeFont (ScreenPtr  pScreen,
FontPtr  pFont 
)
+
+
+

Free pFont on the back-end associated with pScreen.

-void dmxResetFonts (void) +

References _DMXScreenInfo::beDisplay, dmxFontPrivateIndex, dmxScreens, and _dmxFontPriv::font.

-Bool dmxBELoadFont (ScreenPtr pScreen, FontPtr pFont) +

Referenced by dmxBEDestroyResources(), and dmxUnrealizeFont().

-Bool dmxRealizeFont (ScreenPtr pScreen, FontPtr pFont) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
Bool dmxBELoadFont (ScreenPtr  pScreen,
FontPtr  pFont 
)
+
+
+

Load the font, pFont, on the back-end server associated with pScreen. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.

-Bool dmxBEFreeFont (ScreenPtr pScreen, FontPtr pFont) +

References _DMXScreenInfo::beDisplay, dmxCheckFontPathElement(), dmxError, dmxFontPath, dmxFontPrivateIndex, dmxFreeFontPath(), dmxGetFontPath(), dmxIgnoreBadFontPaths, dmxLog(), dmxScreens, dmxSetFontPath(), dmxSync(), dmxWarning, and _dmxFontPriv::font.

-Bool dmxUnrealizeFont (ScreenPtr pScreen, FontPtr pFont) +

Referenced by dmxAttachScreen(), dmxBECreateResources(), and dmxRealizeFont().

- -

Detailed Description

-This file provides support for fonts.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxBEFreeFont ( ScreenPtr  pScreen, static int dmxCheckFontPath (DMXScreenInfo *  dmxScreen,
FontPtr  pFontint *  error 
) ) [static]
-
- - - - - -
-   - - -

-Free pFont on the back-end associated with pScreen.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, dmxSetFontPath(), and dmxSync().

+ +

Referenced by dmxProcSetFontPath().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + + +
Bool dmxBELoadFont ( ScreenPtr  pScreen, static Bool dmxCheckFontPathElement (DMXScreenInfo *  dmxScreen,
char *  fp 
FontPtr  pFont) [static]
+ +
+ +

References _DMXScreenInfo::beDisplay, dmxFontErrorHandler(), dmxFontLastError, and dmxSync().

+ +

Referenced by dmxBELoadFont().

+ +
+ + +
+
+ + + + + + + - - + + + + + + + +
static int dmxFontErrorHandler (Display *  dpy,
) XErrorEvent *  ev 
) [static]
+
+
+ +

References dmxFontLastError.

+ +

Referenced by dmxCheckFontPathElement(), and dmxSetFontPath().

+
+
+ +
+
+ + + + + + + + +
static void dmxFreeFontPath (char **  fp )  [static]
-
- - - - - -
-   - - -

-Load the font, pFont, on the back-end server associated with pScreen. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.

-

- - - - -
- + +
+ +

Referenced by dmxBELoadFont(), and dmxSetFontPath().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInitFonts ( void   ) static char** dmxGetFontPath (int *  npaths )  [static]
+ +
+ +

References dmxDebug, and dmxLog().

+

Referenced by dmxBELoadFont(), and dmxSetFontPath().

+ +
+ + +
+
+ + + + + + + + +
void dmxInitFonts (void  ) 
-
- - - - - -
-   - - -

-Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.

-

- - - - -
- + +
+

Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.

+ +

References dmxProcSetFontPath(), and dmxSaveProcVector.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
- - - - + + + + + + +
Bool dmxRealizeFont ( ScreenPtr  pScreen, static int dmxProcSetFontPath (ClientPtr  client )  [static]
+ +
+ +

References dmxCheckFontPath(), dmxNumScreens, and dmxScreens.

+ +

Referenced by dmxInitFonts().

+ +
+ + +
+
+ + + + + + + + - - - + + - - + + -
Bool dmxRealizeFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
-
- - - - - -
-   - - -

-Realize the font, pFont, on the back-end server associated with pScreen.

-

- - - - -
- + +
+

Realize the font, pFont, on the back-end server associated with pScreen.

+ +

References _DMXScreenInfo::beDisplay, dmxBELoadFont(), dmxFontPrivateIndex, dmxScreens, _dmxFontPriv::font, and _dmxFontPriv::refcnt.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxResetFonts ( void   ) void dmxResetFonts (void  ) 
+ +
+

Reset font support by restoring the original ProcVector function pointers.

+ +

References dmxSaveProcVector.

+

Referenced by dmxCloseScreen().

+ +
+ + +
+
+ + + + + + + + +
static int dmxSetFontPath (DMXScreenInfo *  dmxScreen )  [static]
-
- - - - - -
-   - - -

-Reset font support by restoring the original ProcVector function pointers.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, dmxFontErrorHandler(), dmxFontLastError, dmxFreeFontPath(), dmxGetFontPath(), and dmxSync().

+ +

Referenced by dmxBELoadFont(), and dmxCheckFontPath().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + +
Bool dmxUnrealizeFont ( ScreenPtr  pScreen, Bool dmxUnrealizeFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
+ +
+

Unrealize the font, pFont, on the back-end server associated with pScreen.

+ +

References _DMXScreenInfo::beDisplay, dmxBEFreeFont(), dmxFontPrivateIndex, dmxScreens, _dmxFontPriv::font, and _dmxFontPriv::refcnt.

+

Referenced by dmxScreenInit().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
int dmxFontLastError [static]
-
- - - - - -
-   - - -

-Unrealize the font, pFont, on the back-end server associated with pScreen.

+

+
+ +

Referenced by dmxCheckFontPathElement(), dmxFontErrorHandler(), and dmxSetFontPath().

+ +
+
+ +
+
+ + + + +
int(* dmxSaveProcVector[256])(ClientPtr) [static]
+
+
+ +

Referenced by dmxInitFonts(), and dmxResetFonts().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html deleted file mode 100644 index 18412915d..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxfont.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXFONT_H
-00039 #define DMXFONT_H
-00040 
-00041 #include "fontstruct.h"
-00042 
-00044 typedef struct _dmxFontPriv {
-00045     int          refcnt;
-00046     XFontStruct **font;
-00047 } dmxFontPrivRec, *dmxFontPrivPtr;
-00048 
-00049 extern void dmxInitFonts(void);
-00050 extern void dmxResetFonts(void);
-00051 
-00052 extern Bool dmxRealizeFont(ScreenPtr pScreen, FontPtr pFont);
-00053 extern Bool dmxUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
-00054 
-00055 extern Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont);
-00056 extern Bool dmxBEFreeFont(ScreenPtr pScreen, FontPtr pFont);
-00057 
-00058 extern int dmxFontPrivateIndex;
-00059 
-00060 #endif /* DMXFONT_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h.html index 503e94697..72b0b35b2 100644 --- a/xorg-server/hw/dmx/doc/html/dmxfont_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxfont_8h.html @@ -6,319 +6,266 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxfont.h File Reference

#include "fontstruct.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxfont.h File Reference

#include <X11/fonts/fontstruct.h>
+

Go to the source code of this file.

+

Data Structures

struct  _dmxFontPriv

Typedefs

typedef _dmxFontPriv dmxFontPrivRec
typedef _dmxFontPriv * dmxFontPrivPtr

Functions

void dmxInitFonts (void)
void dmxResetFonts (void)
Bool dmxRealizeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxUnrealizeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxBELoadFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxBEFreeFont (ScreenPtr pScreen, FontPtr pFont)

Variables

int dmxFontPrivateIndex
+ + + + + + + + + + + + + +

Data Structures

struct  _dmxFontPriv

Typedefs

typedef struct _dmxFontPriv dmxFontPrivRec
typedef struct _dmxFontPriv * dmxFontPrivPtr

Functions

void dmxInitFonts (void)
void dmxResetFonts (void)
Bool dmxRealizeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxUnrealizeFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxBELoadFont (ScreenPtr pScreen, FontPtr pFont)
Bool dmxBEFreeFont (ScreenPtr pScreen, FontPtr pFont)

Variables

int dmxFontPrivateIndex
-

Detailed Description

-Interface for font-related functions.
See also:
dmxfont.c
-

Typedef Documentation

-

- - - - -
- +

Detailed Description

+

Interface for font-related functions.

+
See also:
dmxfont.c
+

Typedef Documentation

+ +
+
+
- +
typedef struct _dmxFontPriv * dmxFontPrivPtr + typedef struct _dmxFontPriv * dmxFontPrivPtr
-
- - - - - -
-   - + +
-

-Font private area.

-

- - - - -
- + + + +
+
+
- +
typedef struct _dmxFontPriv dmxFontPrivRec + typedef struct _dmxFontPriv dmxFontPrivRec
-
- - - - - -
-   - + +
+

Font private area.

-

-Font private area.

-

Function Documentation

-

- - - - -
- + + +

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxBEFreeFont ( ScreenPtr  pScreen, Bool dmxBEFreeFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
-
- - - - - -
-   - + +
+

Free pFont on the back-end associated with pScreen.

-

-Free pFont on the back-end associated with pScreen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, dmxFontPrivateIndex, dmxScreens, and _dmxFontPriv::font.

+ +

Referenced by dmxBEDestroyResources(), and dmxUnrealizeFont().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxBELoadFont ( ScreenPtr  pScreen, Bool dmxBELoadFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
-
- - - - - -
-   - + +
+

Load the font, pFont, on the back-end server associated with pScreen. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.

-

-Load the font, pFont, on the back-end server associated with pScreen. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, dmxCheckFontPathElement(), dmxError, dmxFontPath, dmxFontPrivateIndex, dmxFreeFontPath(), dmxGetFontPath(), dmxIgnoreBadFontPaths, dmxLog(), dmxScreens, dmxSetFontPath(), dmxSync(), dmxWarning, and _dmxFontPriv::font.

+ +

Referenced by dmxAttachScreen(), dmxBECreateResources(), and dmxRealizeFont().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxInitFonts ( void   ) void dmxInitFonts (void  ) 
-
- - - - - -
-   - + +
+

Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.

-

-Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.

-

- - - - -
- +

References dmxProcSetFontPath(), and dmxSaveProcVector.

+ +

Referenced by InitOutput().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxRealizeFont ( ScreenPtr  pScreen, Bool dmxRealizeFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
-
- - - - - -
-   - + +
+

Realize the font, pFont, on the back-end server associated with pScreen.

-

-Realize the font, pFont, on the back-end server associated with pScreen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, dmxBELoadFont(), dmxFontPrivateIndex, dmxScreens, _dmxFontPriv::font, and _dmxFontPriv::refcnt.

+ +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxResetFonts ( void   ) void dmxResetFonts (void  ) 
-
- - - - - -
-   - + +
+

Reset font support by restoring the original ProcVector function pointers.

-

-Reset font support by restoring the original ProcVector function pointers.

-

- - - - -
- +

References dmxSaveProcVector.

+ +

Referenced by dmxCloseScreen().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxUnrealizeFont ( ScreenPtr  pScreen, Bool dmxUnrealizeFont (ScreenPtr  pScreen,
FontPtr  pFontFontPtr  pFont 
) )
-
- - - - - -
-   - + +
+

Unrealize the font, pFont, on the back-end server associated with pScreen.

-

-Unrealize the font, pFont, on the back-end server associated with pScreen.

-

Variable Documentation

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, dmxBEFreeFont(), dmxFontPrivateIndex, dmxScreens, _dmxFontPriv::font, and _dmxFontPriv::refcnt.

+ +

Referenced by dmxScreenInit().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxFontPrivateIndex + int dmxFontPrivateIndex
-
- - - - - -
-   - + +
+

Private index for Fonts

-

-Private index for Fonts

+

Referenced by dmxBEFreeFont(), dmxBELoadFont(), dmxChangeGC(), dmxRealizeFont(), dmxScreenInit(), and dmxUnrealizeFont().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html new file mode 100644 index 000000000..be962052f --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html @@ -0,0 +1,91 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8c.html b/xorg-server/hw/dmx/doc/html/dmxgc_8c.html index 1102958ed..0d14817e1 100644 --- a/xorg-server/hw/dmx/doc/html/dmxgc_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxgc_8c.html @@ -6,442 +6,432 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxgc.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxgc.h"
-#include "dmxgcops.h"
-#include "dmxpixmap.h"
-#include "dmxfont.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "migc.h"
- - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxgc.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxgc.h"
+#include "dmxgcops.h"
+#include "dmxpixmap.h"
+#include "dmxfont.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "migc.h"
+

Functions

Bool dmxInitGC (ScreenPtr pScreen)
void dmxBECreateGC (ScreenPtr pScreen, GCPtr pGC)
Bool dmxCreateGC (GCPtr pGC)
void dmxValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
void dmxChangeGC (GCPtr pGC, unsigned long mask)
void dmxCopyGC (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
Bool dmxBEFreeGC (GCPtr pGC)
void dmxDestroyGC (GCPtr pGC)
void dmxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects)
void dmxDestroyClip (GCPtr pGC)
void dmxCopyClip (GCPtr pGCDst, GCPtr pGCSrc)
+ + + + + + + + + + + + + + +

Functions

Bool dmxInitGC (ScreenPtr pScreen)
void dmxBECreateGC (ScreenPtr pScreen, GCPtr pGC)
Bool dmxCreateGC (GCPtr pGC)
void dmxValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
void dmxChangeGC (GCPtr pGC, unsigned long mask)
void dmxCopyGC (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
Bool dmxBEFreeGC (GCPtr pGC)
void dmxDestroyGC (GCPtr pGC)
void dmxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects)
void dmxDestroyClip (GCPtr pGC)
void dmxCopyClip (GCPtr pGCDst, GCPtr pGCSrc)

Variables

static GCFuncs dmxGCFuncs
static GCOps dmxGCOps
-

Detailed Description

-This file provides support for GCs.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support for GCs.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxBECreateGC ( ScreenPtr  pScreen, void dmxBECreateGC (ScreenPtr  pScreen,
GCPtr  pGCGCPtr  pGC 
) )
-
- - - - - -
-   - + +
+

Create the GC on the back-end server.

-

-Create the GC on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, DMX_GET_GC_PRIV, dmxScreens, _dmxGCPriv::gc, and _DMXScreenInfo::scrnDefDrawables.

+ +

Referenced by dmxBECreateResources(), dmxBECreateScratchGCs(), and dmxCreateGC().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreeGC ( GCPtr  pGC  ) Bool dmxBEFreeGC (GCPtr  pGC ) 
-
- - - - - -
-   - + +
+

Free the pGC on the back-end server.

-

-Free the pGC on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +

Referenced by dmxBEDestroyResources(), dmxBEDestroyScratchGCs(), and dmxDestroyGC().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxChangeClip ( GCPtr  pGC, void dmxChangeClip (GCPtr  pGC,
int  type, int  type,
pointer  pvalue, pointer  pvalue,
int  nrectsint  nrects 
) )
-
- - - - - -
-   - - -

-Change the clip rects for a GC.

-

- - - - -
- + +
+

Change the clip rects for a GC.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangeGC ( GCPtr  pGC, void dmxChangeGC (GCPtr  pGC,
unsigned long  maskunsigned long  mask 
) )
-
- - - - - -
-   - + +
+

Set the values in the graphics context on the back-end server associated with pGC's screen.

-

-Set the values in the graphics context on the back-end server associated with pGC's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, DMX_GET_PIXMAP_PRIV, dmxFontPrivateIndex, dmxScreens, dmxSync(), _dmxFontPriv::font, _dmxGCPriv::gc, _dmxGCPriv::msc, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxBECreateResources().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCopyClip ( GCPtr  pGCDst, void dmxCopyClip (GCPtr  pGCDst,
GCPtr  pGCSrcGCPtr  pGCSrc 
) )
-
- - - - - -
-   - - -

-Copy a GC's clip rects.

-

- - - - -
- + +
+

Copy a GC's clip rects.

+ +

References DMX_GC_FUNC_EPILOGUE, and DMX_GC_FUNC_PROLOGUE.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCopyGC ( GCPtr  pGCSrc, void dmxCopyGC (GCPtr  pGCSrc,
unsigned long  changes, unsigned long  changes,
GCPtr  pGCDstGCPtr  pGCDst 
) )
-
- - - - - -
-   - - -

-Copy pGCSrc to pGCDst on the back-end server associated with pGCSrc's screen.

-

- - - - -
- + +
+

Copy pGCSrc to pGCDst on the back-end server associated with pGCSrc's screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateGC ( GCPtr  pGC  ) Bool dmxCreateGC (GCPtr  pGC ) 
-
- - - - - -
-   - + +
+

Create a graphics context on the back-end server associated /a pGC's screen.

-

-Create a graphics context on the back-end server associated /a pGC's screen.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_GC_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBECreateGC(), dmxCreateGC(), dmxGCFuncs, dmxScreens, _dmxGCPriv::funcs, _dmxGCPriv::gc, _dmxGCPriv::msc, and _dmxGCPriv::ops.

+ +

Referenced by dmxCreateGC(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxDestroyClip ( GCPtr  pGC  ) void dmxDestroyClip (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Destroy a GC's clip rects.

-

- - - - -
- + +
+

Destroy a GC's clip rects.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyGC ( GCPtr  pGC  ) void dmxDestroyGC (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Destroy the graphics context, pGC and free the corresponding GC on the back-end server.

-

- - - - -
- + +
+

Destroy the graphics context, pGC and free the corresponding GC on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, dmxBEFreeGC(), and dmxScreens.

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxInitGC ( ScreenPtr  pScreen  ) Bool dmxInitGC (ScreenPtr  pScreen ) 
-
- - - - - -
-   - + +
+

Initialize the GC on pScreen

-

-Initialize the GC on pScreen, which currently involves allocating the GC private associated with this screen.

-

- - - - -
- +

References dmxGCPrivateKey.

+ +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxValidateGC ( GCPtr  pGC, void dmxValidateGC (GCPtr  pGC,
unsigned long  changes, unsigned long  changes,
DrawablePtr  pDrawableDrawablePtr  pDrawable 
) )
-
- - - - - -
-   - - -

-Validate a graphics context, pGC, locally in the DMX server and recompute the composite clip, if necessary.

+ +

+

Validate a graphics context, pGC, locally in the DMX server and recompute the composite clip, if necessary.

+ +

References DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, and _dmxGCPriv::ops.

+ +
+ +

Variable Documentation

+ +
+
+ + + + +
GCFuncs dmxGCFuncs [static]
+
+
+Initial value:
 {
+    dmxValidateGC,
+    dmxChangeGC,
+    dmxCopyGC,
+    dmxDestroyGC,
+    dmxChangeClip,
+    dmxDestroyClip,
+    dmxCopyClip,
+}
+
+

Referenced by dmxCreateGC().

+ +
+
+ +
+
+ + + + +
GCOps dmxGCOps [static]
+
+
+Initial value:
 {
+    dmxFillSpans,
+    dmxSetSpans,
+    dmxPutImage,
+    dmxCopyArea,
+    dmxCopyPlane,
+    dmxPolyPoint,
+    dmxPolylines,
+    dmxPolySegment,
+    dmxPolyRectangle,
+    dmxPolyArc,
+    dmxFillPolygon,
+    dmxPolyFillRect,
+    dmxPolyFillArc,
+    dmxPolyText8,
+    dmxPolyText16,
+    dmxImageText8,
+    dmxImageText16,
+    dmxImageGlyphBlt,
+    dmxPolyGlyphBlt,
+    dmxPushPixels
+}
+
+
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html deleted file mode 100644 index 9e1df9e31..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxgc.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXGC_H
-00039 #define DMXGC_H
-00040 
-00041 #include "gcstruct.h"
-00042 
-00044 typedef struct _dmxGCPriv {
-00045     GCOps   *ops;
-00046     GCFuncs *funcs;
-00047     XlibGC   gc;
-00048     Bool     msc;
-00049 } dmxGCPrivRec, *dmxGCPrivPtr;
-00050 
-00051 
-00052 extern Bool dmxInitGC(ScreenPtr pScreen);
-00053 
-00054 extern Bool dmxCreateGC(GCPtr pGC);
-00055 extern void dmxValidateGC(GCPtr pGC, unsigned long changes,
-00056                           DrawablePtr pDrawable);
-00057 extern void dmxChangeGC(GCPtr pGC, unsigned long mask);
-00058 extern void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst);
-00059 extern void dmxDestroyGC(GCPtr pGC);
-00060 extern void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
-00061 extern void dmxDestroyClip(GCPtr pGC);
-00062 extern void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
-00063 
-00064 extern void dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC);
-00065 extern Bool dmxBEFreeGC(GCPtr pGC);
-00066 
-00068 extern int dmxGCPrivateIndex;
-00069 
-00071 #define DMX_GET_GC_PRIV(_pGC)                                           \
-00072     (dmxGCPrivPtr)(_pGC)->devPrivates[dmxGCPrivateIndex].ptr
-00073 
-00074 #define DMX_GC_FUNC_PROLOGUE(_pGC)                                      \
-00075 do {                                                                    \
-00076     dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \
-00077     DMX_UNWRAP(funcs, _pGCPriv, (_pGC));                                \
-00078     if (_pGCPriv->ops)                                                  \
-00079         DMX_UNWRAP(ops, _pGCPriv, (_pGC));                              \
-00080 } while (0)
-00081 
-00082 #define DMX_GC_FUNC_EPILOGUE(_pGC)                                      \
-00083 do {                                                                    \
-00084     dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \
-00085     DMX_WRAP(funcs, &dmxGCFuncs, _pGCPriv, (_pGC));                     \
-00086     if (_pGCPriv->ops)                                                  \
-00087         DMX_WRAP(ops, &dmxGCOps, _pGCPriv, (_pGC));                     \
-00088 } while (0)
-00089 
-00090 #endif /* DMXGC_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h.html index f16d40d02..3341c2b68 100644 --- a/xorg-server/hw/dmx/doc/html/dmxgc_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxgc_8h.html @@ -6,547 +6,498 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxgc.h File Reference

#include "gcstruct.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxgc.h File Reference

#include "gcstruct.h"
+ +

Go to the source code of this file.

+

Data Structures

struct  _dmxGCPriv

Defines

#define DMX_GET_GC_PRIV(_pGC)   (dmxGCPrivPtr)(_pGC)->devPrivates[dmxGCPrivateIndex].ptr

Typedefs

typedef _dmxGCPriv dmxGCPrivRec
typedef _dmxGCPriv * dmxGCPrivPtr

Functions

Bool dmxInitGC (ScreenPtr pScreen)
Bool dmxCreateGC (GCPtr pGC)
void dmxValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
void dmxChangeGC (GCPtr pGC, unsigned long mask)
void dmxCopyGC (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
void dmxDestroyGC (GCPtr pGC)
void dmxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects)
void dmxDestroyClip (GCPtr pGC)
void dmxCopyClip (GCPtr pGCDst, GCPtr pGCSrc)
void dmxBECreateGC (ScreenPtr pScreen, GCPtr pGC)
Bool dmxBEFreeGC (GCPtr pGC)

Variables

int dmxGCPrivateIndex
+ + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _dmxGCPriv

Defines

#define DMX_GET_GC_PRIV(_pGC)   (dmxGCPrivPtr)dixLookupPrivate(&(_pGC)->devPrivates, dmxGCPrivateKey)
#define DMX_GC_FUNC_PROLOGUE(_pGC)
#define DMX_GC_FUNC_EPILOGUE(_pGC)

Typedefs

typedef struct _dmxGCPriv dmxGCPrivRec
typedef struct _dmxGCPriv * dmxGCPrivPtr

Functions

Bool dmxInitGC (ScreenPtr pScreen)
Bool dmxCreateGC (GCPtr pGC)
void dmxValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
void dmxChangeGC (GCPtr pGC, unsigned long mask)
void dmxCopyGC (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
void dmxDestroyGC (GCPtr pGC)
void dmxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects)
void dmxDestroyClip (GCPtr pGC)
void dmxCopyClip (GCPtr pGCDst, GCPtr pGCSrc)
void dmxBECreateGC (ScreenPtr pScreen, GCPtr pGC)
Bool dmxBEFreeGC (GCPtr pGC)

Variables

DevPrivateKey dmxGCPrivateKey
-

Detailed Description

-Interface for GC support.
See also:
dmxgc.c
-

Define Documentation

-

- - - +

References _DMXScreenInfo::beDisplay, and _DMXScreenInfo::WMRunningOnBE.

- +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

- - + + + +
+
+
- - - - - - - - - -
#define DMX_GET_GC_PRIV( _pGC   )    (dmxGCPrivPtr)(_pGC)->devPrivates[dmxGCPrivateIndex].ptr +

Detailed Description

+

Interface for GC support.

+
See also:
dmxgc.c
+

Define Documentation

+ +
+
+ + + + + + + + +
#define DMX_GC_FUNC_EPILOGUE(_pGC  ) 
-
- - - - - -
-   - - -

-Get private.

-

Typedef Documentation

-

- - - +

Referenced by InitOutput().

- + + + +
+
+
- - - - -
typedef struct _dmxGCPriv * dmxGCPrivPtr + +
+Value:
do {                                                                    \
+    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \
+    DMX_WRAP(funcs, &dmxGCFuncs, _pGCPriv, (_pGC));                     \
+    if (_pGCPriv->ops)                                                  \
+        DMX_WRAP(ops, &dmxGCOps, _pGCPriv, (_pGC));                     \
+} while (0)
+
+

Referenced by dmxChangeClip(), dmxChangeGC(), dmxCopyClip(), dmxCopyGC(), dmxDestroyClip(), dmxDestroyGC(), and dmxValidateGC().

+ +
+ + +
+
+ + + + + + + + +
#define DMX_GC_FUNC_PROLOGUE(_pGC  ) 
-
- - - - - -
-   - - -

-GC private area.

-

- - - - -
- + +
+Value:
do {                                                                    \
+    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \
+    DMX_UNWRAP(funcs, _pGCPriv, (_pGC));                                \
+    if (_pGCPriv->ops)                                                  \
+        DMX_UNWRAP(ops, _pGCPriv, (_pGC));                              \
+} while (0)
+
+

Referenced by dmxChangeClip(), dmxChangeGC(), dmxCopyClip(), dmxCopyGC(), dmxDestroyClip(), dmxDestroyGC(), and dmxValidateGC().

+ +
+ + +
+
+
- + + + + + +
typedef struct _dmxGCPriv dmxGCPrivRec + #define DMX_GET_GC_PRIV(_pGC  )    (dmxGCPrivPtr)dixLookupPrivate(&(_pGC)->devPrivates, dmxGCPrivateKey)
-
- - - - - -
-   - - -

-GC private area.

-

Function Documentation

-

- - - - -
- + +
+

Get private.

+ +

Referenced by dmxBECreateGC(), dmxBEFreeGC(), dmxChangeClip(), dmxChangeGC(), dmxCopyArea(), dmxCopyGC(), dmxCopyPlane(), dmxCreateGC(), dmxDestroyClip(), dmxFillPolygon(), dmxImageText16(), dmxImageText8(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPutImage(), and dmxValidateGC().

+ +
+ +

Typedef Documentation

+ +
+
+
- - - - + +
void dmxBECreateGC ( ScreenPtr  pScreen, typedef struct _dmxGCPriv * dmxGCPrivPtr
+ +
+ +
+ + +
+
+ + + +
typedef struct _dmxGCPriv dmxGCPrivRec
+
+
+

GC private area.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + - - - + + - - + + -
void dmxBECreateGC (ScreenPtr  pScreen,
GCPtr  pGCGCPtr  pGC 
) )
-
- - - - - -
-   - - -

-Create the GC on the back-end server.

-

- - - - -
- + +
+

Create the GC on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, DMX_GET_GC_PRIV, dmxScreens, _dmxGCPriv::gc, and _DMXScreenInfo::scrnDefDrawables.

+ +

Referenced by dmxBECreateResources(), dmxBECreateScratchGCs(), and dmxCreateGC().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreeGC ( GCPtr  pGC  ) Bool dmxBEFreeGC (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Free the pGC on the back-end server.

-

- - - - -
- + +
+

Free the pGC on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +

Referenced by dmxBEDestroyResources(), dmxBEDestroyScratchGCs(), and dmxDestroyGC().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxChangeClip ( GCPtr  pGC, void dmxChangeClip (GCPtr  pGC,
int  type, int  type,
pointer  pvalue, pointer  pvalue,
int  nrectsint  nrects 
) )
-
- - - - - -
-   - - -

-Change the clip rects for a GC.

-

- - - - -
- + +
+

Change the clip rects for a GC.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangeGC ( GCPtr  pGC, void dmxChangeGC (GCPtr  pGC,
unsigned long  maskunsigned long  mask 
) )
-
- - - - - -
-   - - -

-Set the values in the graphics context on the back-end server associated with pGC's screen.

-

- - - - -
- + +
+

Set the values in the graphics context on the back-end server associated with pGC's screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, DMX_GET_PIXMAP_PRIV, dmxFontPrivateIndex, dmxScreens, dmxSync(), _dmxFontPriv::font, _dmxGCPriv::gc, _dmxGCPriv::msc, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxBECreateResources().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCopyClip ( GCPtr  pGCDst, void dmxCopyClip (GCPtr  pGCDst,
GCPtr  pGCSrcGCPtr  pGCSrc 
) )
-
- - - - - -
-   - - -

-Copy a GC's clip rects.

-

- - - - -
- + +
+

Copy a GC's clip rects.

+ +

References DMX_GC_FUNC_EPILOGUE, and DMX_GC_FUNC_PROLOGUE.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCopyGC ( GCPtr  pGCSrc, void dmxCopyGC (GCPtr  pGCSrc,
unsigned long  changes, unsigned long  changes,
GCPtr  pGCDstGCPtr  pGCDst 
) )
-
- - - - - -
-   - - -

-Copy pGCSrc to pGCDst on the back-end server associated with pGCSrc's screen.

-

- - - - -
- + +
+

Copy pGCSrc to pGCDst on the back-end server associated with pGCSrc's screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateGC ( GCPtr  pGC  ) Bool dmxCreateGC (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Create a graphics context on the back-end server associated /a pGC's screen.

-

- - - - -
- + +
+

Create a graphics context on the back-end server associated /a pGC's screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GC_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBECreateGC(), dmxCreateGC(), dmxGCFuncs, dmxScreens, _dmxGCPriv::funcs, _dmxGCPriv::gc, _dmxGCPriv::msc, and _dmxGCPriv::ops.

+ +

Referenced by dmxCreateGC(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyClip ( GCPtr  pGC  ) void dmxDestroyClip (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Destroy a GC's clip rects.

-

- - - - -
- + +
+

Destroy a GC's clip rects.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, dmxScreens, and _dmxGCPriv::gc.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyGC ( GCPtr  pGC  ) void dmxDestroyGC (GCPtr  pGC ) 
-
- - - - - -
-   - - -

-Destroy the graphics context, pGC and free the corresponding GC on the back-end server.

-

- - - - -
- + +
+

Destroy the graphics context, pGC and free the corresponding GC on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, dmxBEFreeGC(), and dmxScreens.

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxInitGC ( ScreenPtr  pScreen  ) Bool dmxInitGC (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Initialize the GC on pScreen, which currently involves allocating the GC private associated with this screen.

-

- - - - -
- + +
+

Initialize the GC on pScreen

+ +

References dmxGCPrivateKey.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxValidateGC ( GCPtr  pGC, void dmxValidateGC (GCPtr  pGC,
unsigned long  changes, unsigned long  changes,
DrawablePtr  pDrawableDrawablePtr  pDrawable 
) )
-
- - - - - -
-   - - -

-Validate a graphics context, pGC, locally in the DMX server and recompute the composite clip, if necessary.

-

Variable Documentation

-

- - - +

References _DMXScreenInfo::beDisplay, and dmxNumScreens.

- +

Referenced by ddxGiveUp().

- + + + +
+
+
- - - - -
int dmxGCPrivateIndex + +
+

Validate a graphics context, pGC, locally in the DMX server and recompute the composite clip, if necessary.

+ +

References DMX_GC_FUNC_EPILOGUE, DMX_GC_FUNC_PROLOGUE, DMX_GET_GC_PRIV, and _dmxGCPriv::ops.

+ +
+ +

Variable Documentation

+ +
+
+ + + +
DevPrivateKey dmxGCPrivateKey
-
- - - - - -
-   - - -

-Private index for GCs

+ +
+

Private index.

+
See also:
dmxgc.c
+
+dmxscrinit.c
+

Private index for GCs

+ +

Referenced by dmxInitGC().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html new file mode 100644 index 000000000..11b8e5a9f --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html @@ -0,0 +1,119 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html index d24b53a2c..42ecb5c79 100644 --- a/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html @@ -6,1462 +6,1370 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxgcops.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxgc.h"
-#include "dmxgcops.h"
-#include "dmxwindow.h"
-#include "dmxpixmap.h"
-#include "mi.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "dixfontstr.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxgcops.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxgc.h"
+#include "dmxgcops.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+#include "mi.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "dixfontstr.h"
+

Functions

void dmxFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
void dmxSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
void dmxPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)
RegionPtr dmxCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)
RegionPtr dmxCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)
void dmxPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
void dmxPolyRectangle (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)
void dmxPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
void dmxFillPolygon (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)
void dmxPolyFillRect (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
void dmxPolyFillArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
int dmxPolyText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
int dmxPolyText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
void dmxImageText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)
void dmxGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)
void dmxGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
+ + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_GCOPS_SET_DRAWABLE(_pDraw, _draw)
#define DMX_GCOPS_OFFSCREEN(_pDraw)

Functions

void dmxFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
void dmxSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
void dmxPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)
RegionPtr dmxCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)
RegionPtr dmxCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)
void dmxPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
void dmxPolyRectangle (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)
void dmxPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
void dmxFillPolygon (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)
void dmxPolyFillRect (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
void dmxPolyFillArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
int dmxPolyText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
int dmxPolyText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
void dmxImageText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)
static DMXScreenInfo * dmxFindAlternatePixmap (DrawablePtr pDrawable, XID *draw)
void dmxGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)
void dmxGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
-

Detailed Description

-This file provides support for GC operations.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support for GC operations.

+

Define Documentation

+ +
+
+
- - - - + + + + + + +
RegionPtr dmxCopyArea ( DrawablePtr  pSrc, #define DMX_GCOPS_OFFSCREEN(_pDraw  ) 
+ +
+Value:
(!dmxScreens[(_pDraw)->pScreen->myNum].beDisplay ||                     \
+     (dmxOffScreenOpt &&                                                \
+      (_pDraw)->type == DRAWABLE_WINDOW &&                              \
+      (DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw))->offscreen ||           \
+       !DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw))->window)))
+
+

Referenced by dmxCopyArea(), dmxCopyPlane(), dmxFillPolygon(), dmxGetImage(), dmxImageText16(), dmxImageText8(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), and dmxPutImage().

+ +
+ + +
+
+ - - - - + + + + + + + - - +
DrawablePtr  pDst, #define DMX_GCOPS_SET_DRAWABLE(_pDraw,
_draw  )  GCPtr  pGC,
+
+
+Value:
do {                                                                    \
+    if ((_pDraw)->type == DRAWABLE_WINDOW) {                            \
+        dmxWinPrivPtr  pWinPriv =                                       \
+            DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw));                   \
+        (_draw) = (Drawable)pWinPriv->window;                           \
+    } else {                                                            \
+        dmxPixPrivPtr  pPixPriv =                                       \
+            DMX_GET_PIXMAP_PRIV((PixmapPtr)(_pDraw));                   \
+        (_draw) = (Drawable)pPixPriv->pixmap;                           \
+    }                                                                   \
+} while (0)
+
+

Referenced by dmxCopyArea(), dmxCopyPlane(), dmxFillPolygon(), dmxGetImage(), dmxImageText16(), dmxImageText8(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), and dmxPutImage().

+ +
+
+

Function Documentation

+ +
+
+ - - - - + + + + + - - - + + + - - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + - - + + -
int  srcx, RegionPtr dmxCopyArea (DrawablePtr  pSrc,
int  srcy, DrawablePtr  pDst,
int  w, GCPtr  pGC,
int  srcx,
int  h, int  srcy,
int  w,
int  dstx, int  h,
int  dstx,
int  dstyint  dsty 
) )
-
- - - - - -
-   - + +
+

Copy area from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

-Copy area from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
RegionPtr dmxCopyPlane ( DrawablePtr  pSrc, RegionPtr dmxCopyPlane (DrawablePtr  pSrc,
DrawablePtr  pDst, DrawablePtr  pDst,
GCPtr  pGC, GCPtr  pGC,
int  srcx, int  srcx,
int  srcy, int  srcy,
int  width, int  width,
int  height, int  height,
int  dstx, int  dstx,
int  dsty, int  dsty,
unsigned long  bitPlaneunsigned long  bitPlane 
) )
-
- - - - - -
-   - + +
+

Copy plane number bitPlane from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

-Copy plane number bitPlane from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxFillPolygon ( DrawablePtr  pDrawable, void dmxFillPolygon (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  shape, int  shape,
int  mode, int  mode,
int  count, int  count,
DDXPointPtr  pPtsDDXPointPtr  pPts 
) )
-
- - - - - -
-   - + +
+

Render a filled polygons in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render a filled polygons in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxFillSpans ( DrawablePtr  pDrawable, void dmxFillSpans (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nInit, int  nInit,
DDXPointPtr  pptInit, DDXPointPtr  pptInit,
int *  pwidthInit, int *  pwidthInit,
int  fSortedint  fSorted 
) )
-
- - - - - -
-   - + +
+

Fill spans -- this function should never be called.

-

-Fill spans -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - - + + +
void dmxGetImage ( DrawablePtr  pDrawable, static DMXScreenInfo* dmxFindAlternatePixmap (DrawablePtr  pDrawable,
int  sx, XID *  draw 
int  sy, ) [static]
+ +
+

When Xinerama is active, the client pixmaps are always obtained from screen 0. When screen 0 is detached, the pixmaps must be obtained from any other screen that is not detached. Usually, this is screen 1.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxGetImage().

+ +
+ + +
+
+ - - - - + + + + + - - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + - - + + -
int  w, void dmxGetImage (DrawablePtr  pDrawable,
int  h, int  sx,
int  sy,
unsigned int  format, int  w,
int  h,
unsigned long  planeMask, unsigned int  format,
unsigned long  planeMask,
char *  pdstLinechar *  pdstLine 
) )
-
- - - - - -
-   - + +
+

Get an image from the back-end server associated with pDrawable's screen. If pDrawable is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of pDrawable that is viewable. If no viewable ancestor is found, then simply return without getting an image.

-

-Get an image from the back-end server associated with pDrawable's screen. If pDrawable is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of pDrawable that is viewable. If no viewable ancestor is found, then simply return without getting an image.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, dmxFindAlternatePixmap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxGetSpans ( DrawablePtr  pDrawable, void dmxGetSpans (DrawablePtr  pDrawable,
int  wMax, int  wMax,
DDXPointPtr  ppt, DDXPointPtr  ppt,
int *  pwidth, int *  pwidth,
int  nspans, int  nspans,
char *  pdstStartchar *  pdstStart 
) )
-
- - - - - -
-   - + +
+

Get Spans -- this function should never be called.

-

-Get Spans -- this function should never be called.

-

- - - - -
- +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageGlyphBlt ( DrawablePtr  pDrawable, void dmxImageGlyphBlt (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
unsigned int  nglyph, unsigned int  nglyph,
CharInfoPtr *  ppci, CharInfoPtr *  ppci,
pointer  pglyphBasepointer  pglyphBase 
) )
-
- - - - - -
-   - + +
+

Image Glyph Blt -- this function should never be called.

-

-Image Glyph Blt -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageText16 ( DrawablePtr  pDrawable, void dmxImageText16 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
unsigned short *  charsunsigned short *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 16-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 16-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageText8 ( DrawablePtr  pDrawable, void dmxImageText8 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
char *  charschar *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 8-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 8-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyArc ( DrawablePtr  pDrawable, void dmxPolyArc (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  narcs, int  narcs,
xArc *  parcsxArc *  parcs 
) )
-
- - - - - -
-   - + +
+

Render list of arc outlines, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of arc outlines, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyFillArc ( DrawablePtr  pDrawable, void dmxPolyFillArc (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  narcs, int  narcs,
xArc *  parcsxArc *  parcs 
) )
-
- - - - - -
-   - + +
+

Render list of filled arcs, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of filled arcs, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyFillRect ( DrawablePtr  pDrawable, void dmxPolyFillRect (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nrectFill, int  nrectFill,
xRectangle *  prectInitxRectangle *  prectInit 
) )
-
- - - - - -
-   - + +
+

Render list of filled rectangles, prectInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of filled rectangles, prectInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyGlyphBlt ( DrawablePtr  pDrawable, void dmxPolyGlyphBlt (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
unsigned int  nglyph, unsigned int  nglyph,
CharInfoPtr *  ppci, CharInfoPtr *  ppci,
pointer  pglyphBasepointer  pglyphBase 
) )
-
- - - - - -
-   - + +
+

Poly Glyph Blt -- this function should never be called.

-

-Poly Glyph Blt -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolylines ( DrawablePtr  pDrawable, void dmxPolylines (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  mode, int  mode,
int  npt, int  npt,
DDXPointPtr  pptInitDDXPointPtr  pptInit 
) )
-
- - - - - -
-   - + +
+

Render list of connected lines, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of connected lines, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyPoint ( DrawablePtr  pDrawable, void dmxPolyPoint (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  mode, int  mode,
int  npt, int  npt,
DDXPointPtr  pptInitDDXPointPtr  pptInit 
) )
-
- - - - - -
-   - + +
+

Render list of points, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of points, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyRectangle ( DrawablePtr  pDrawable, void dmxPolyRectangle (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nrects, int  nrects,
xRectangle *  pRectsxRectangle *  pRects 
) )
-
- - - - - -
-   - + +
+

Render list of rectangle outlines, pRects in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of rectangle outlines, pRects in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolySegment ( DrawablePtr  pDrawable, void dmxPolySegment (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nseg, int  nseg,
xSegment *  pSegsxSegment *  pSegs 
) )
-
- - - - - -
-   - + +
+

Render list of disjoint segments, pSegs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of disjoint segments, pSegs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPolyText16 ( DrawablePtr  pDrawable, int dmxPolyText16 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
unsigned short *  charsunsigned short *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 16-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 16-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPolyText8 ( DrawablePtr  pDrawable, int dmxPolyText8 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
char *  charschar *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 8-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 8-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPushPixels ( GCPtr  pGC, void dmxPushPixels (GCPtr  pGC,
PixmapPtr  pBitMap, PixmapPtr  pBitMap,
DrawablePtr  pDst, DrawablePtr  pDst,
int  w, int  w,
int  h, int  h,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - + +
+

Push Pixels -- this function should never be called.

-

-Push Pixels -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPutImage ( DrawablePtr  pDrawable, void dmxPutImage (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  depth, int  depth,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  h, int  h,
int  leftPad, int  leftPad,
int  format, int  format,
char *  pBitschar *  pBits 
) )
-
- - - - - -
-   - + +
+

Transfer pBits image to back-end server associated with pDrawable's screen. If primitive subdivision optimization is enabled, then only transfer the sections of pBits that are visible (i.e., not-clipped) to the back-end server.

-

-Transfer pBits image to back-end server associated with pDrawable's screen. If primitive subdivision optimization is enabled, then only transfer the sections of pBits that are visible (i.e., not-clipped) to the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSubdividePrimitives, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxSetSpans ( DrawablePtr  pDrawable, void dmxSetSpans (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
char *  psrc, char *  psrc,
DDXPointPtr  ppt, DDXPointPtr  ppt,
int *  pwidth, int *  pwidth,
int  nspans, int  nspans,
int  fSortedint  fSorted 
) )
-
- - - - - -
-   - + +
+

Set spans -- this function should never be called.

-

-Set spans -- this function should never be called.

+ + +

diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html deleted file mode 100644 index b232f0b1b..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxgcops.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXGCOPS_H
-00039 #define DMXGCOPS_H
-00040 
-00041 extern void dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
-00042                          int nInit, DDXPointPtr pptInit, int *pwidthInit,
-00043                          int fSorted);
-00044 extern void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
-00045                         char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
-00046                         int fSorted);
-00047 extern void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
-00048                         int depth, int x, int y, int w, int h,
-00049                         int leftPad, int format, char *pBits);
-00050 extern RegionPtr dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-00051                              int srcx, int srcy, int w, int h,
-00052                              int dstx, int dsty);
-00053 extern RegionPtr dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-00054                               int srcx, int srcy, int width, int height,
-00055                               int dstx, int dsty, unsigned long bitPlane);
-00056 extern void dmxPolyPoint(DrawablePtr pDrawable, GCPtr pGC,
-00057                          int mode, int npt, DDXPointPtr pptInit);
-00058 extern void dmxPolylines(DrawablePtr pDrawable, GCPtr pGC,
-00059                          int mode, int npt, DDXPointPtr pptInit);
-00060 extern void dmxPolySegment(DrawablePtr pDrawable, GCPtr pGC,
-00061                            int nseg, xSegment *pSegs);
-00062 extern void dmxPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
-00063                              int nrects, xRectangle *pRects);
-00064 extern void dmxPolyArc(DrawablePtr pDrawable, GCPtr pGC,
-00065                        int narcs, xArc *parcs);
-00066 extern void dmxFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
-00067                            int shape, int mode, int count, DDXPointPtr pPts);
-00068 extern void dmxPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
-00069                             int nrectFill, xRectangle *prectInit);
-00070 extern void dmxPolyFillArc(DrawablePtr pDrawable, GCPtr pGC,
-00071                            int narcs, xArc *parcs);
-00072 extern int dmxPolyText8(DrawablePtr pDrawable, GCPtr pGC,
-00073                         int x, int y, int count, char *chars);
-00074 extern int dmxPolyText16(DrawablePtr pDrawable, GCPtr pGC,
-00075                          int x, int y, int count, unsigned short *chars);
-00076 extern void dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
-00077                           int x, int y, int count, char *chars);
-00078 extern void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
-00079                            int x, int y, int count, unsigned short *chars);
-00080 extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-00081                              int x, int y, unsigned int nglyph,
-00082                              CharInfoPtr *ppci, pointer pglyphBase);
-00083 extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-00084                             int x, int y, unsigned int nglyph,
-00085                             CharInfoPtr *ppci, pointer pglyphBase);
-00086 extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-00087                           int w, int h, int x, int y);
-00088 
-00089 extern void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
-00090                         unsigned int format, unsigned long planeMask,
-00091                         char *pdstLine);
-00092 extern void dmxGetSpans(DrawablePtr pDrawable, int wMax,
-00093                         DDXPointPtr ppt, int *pwidth, int nspans,
-00094                         char *pdstStart);
-00095 
-00096 #endif /* DMXGCOPS_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html index 1f30f11a4..acaef7d88 100644 --- a/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html @@ -6,1455 +6,1265 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxgcops.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
void dmxSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
void dmxPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)
RegionPtr dmxCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)
RegionPtr dmxCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)
void dmxPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
void dmxPolyRectangle (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)
void dmxPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
void dmxFillPolygon (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)
void dmxPolyFillRect (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
void dmxPolyFillArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
int dmxPolyText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
int dmxPolyText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
void dmxImageText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)
void dmxGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)
void dmxGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
+ + + + + + + + + + + + + + + + + + + + + + +

Functions

void dmxFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
void dmxSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
void dmxPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)
RegionPtr dmxCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)
RegionPtr dmxCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)
void dmxPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
void dmxPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
void dmxPolyRectangle (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)
void dmxPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
void dmxFillPolygon (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)
void dmxPolyFillRect (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
void dmxPolyFillArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
int dmxPolyText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
int dmxPolyText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageText8 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)
void dmxImageText16 (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)
void dmxImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)
void dmxPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)
void dmxGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)
void dmxGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
-

Detailed Description

-Interface for gcops support.
See also:
dmxgcops.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for gcops support.

+
See also:
dmxgcops.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
RegionPtr dmxCopyArea ( DrawablePtr  pSrc, RegionPtr dmxCopyArea (DrawablePtr  pSrc,
DrawablePtr  pDst, DrawablePtr  pDst,
GCPtr  pGC, GCPtr  pGC,
int  srcx, int  srcx,
int  srcy, int  srcy,
int  w, int  w,
int  h, int  h,
int  dstx, int  dstx,
int  dstyint  dsty 
) )
-
- - - - - -
-   - + +
+

Copy area from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

-Copy area from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
RegionPtr dmxCopyPlane ( DrawablePtr  pSrc, RegionPtr dmxCopyPlane (DrawablePtr  pSrc,
DrawablePtr  pDst, DrawablePtr  pDst,
GCPtr  pGC, GCPtr  pGC,
int  srcx, int  srcx,
int  srcy, int  srcy,
int  width, int  width,
int  height, int  height,
int  dstx, int  dstx,
int  dsty, int  dsty,
unsigned long  bitPlaneunsigned long  bitPlane 
) )
-
- - - - - -
-   - + +
+

Copy plane number bitPlane from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

-Copy plane number bitPlane from pSrc drawable to pDst drawable on the back-end server associated with pSrc drawable's screen. If the offscreen optimization is enabled, only copy when both pSrc and pDst are at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxFillPolygon ( DrawablePtr  pDrawable, void dmxFillPolygon (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  shape, int  shape,
int  mode, int  mode,
int  count, int  count,
DDXPointPtr  pPtsDDXPointPtr  pPts 
) )
-
- - - - - -
-   - + +
+

Render a filled polygons in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render a filled polygons in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxFillSpans ( DrawablePtr  pDrawable, void dmxFillSpans (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nInit, int  nInit,
DDXPointPtr  pptInit, DDXPointPtr  pptInit,
int *  pwidthInit, int *  pwidthInit,
int  fSortedint  fSorted 
) )
-
- - - - - -
-   - + +
+

Fill spans -- this function should never be called.

-

-Fill spans -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxGetImage ( DrawablePtr  pDrawable, void dmxGetImage (DrawablePtr  pDrawable,
int  sx, int  sx,
int  sy, int  sy,
int  w, int  w,
int  h, int  h,
unsigned int  format, unsigned int  format,
unsigned long  planeMask, unsigned long  planeMask,
char *  pdstLinechar *  pdstLine 
) )
-
- - - - - -
-   - + +
+

Get an image from the back-end server associated with pDrawable's screen. If pDrawable is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of pDrawable that is viewable. If no viewable ancestor is found, then simply return without getting an image.

-

-Get an image from the back-end server associated with pDrawable's screen. If pDrawable is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of pDrawable that is viewable. If no viewable ancestor is found, then simply return without getting an image.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, dmxFindAlternatePixmap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxGetSpans ( DrawablePtr  pDrawable, void dmxGetSpans (DrawablePtr  pDrawable,
int  wMax, int  wMax,
DDXPointPtr  ppt, DDXPointPtr  ppt,
int *  pwidth, int *  pwidth,
int  nspans, int  nspans,
char *  pdstStartchar *  pdstStart 
) )
-
- - - - - -
-   - + +
+

Get Spans -- this function should never be called.

-

-Get Spans -- this function should never be called.

-

- - - - -
- +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageGlyphBlt ( DrawablePtr  pDrawable, void dmxImageGlyphBlt (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
unsigned int  nglyph, unsigned int  nglyph,
CharInfoPtr *  ppci, CharInfoPtr *  ppci,
pointer  pglyphBasepointer  pglyphBase 
) )
-
- - - - - -
-   - + +
+

Image Glyph Blt -- this function should never be called.

-

-Image Glyph Blt -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageText16 ( DrawablePtr  pDrawable, void dmxImageText16 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
unsigned short *  charsunsigned short *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 16-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 16-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxImageText8 ( DrawablePtr  pDrawable, void dmxImageText8 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
char *  charschar *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 8-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 8-bit chars (both foreground and background) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyArc ( DrawablePtr  pDrawable, void dmxPolyArc (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  narcs, int  narcs,
xArc *  parcsxArc *  parcs 
) )
-
- - - - - -
-   - + +
+

Render list of arc outlines, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of arc outlines, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyFillArc ( DrawablePtr  pDrawable, void dmxPolyFillArc (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  narcs, int  narcs,
xArc *  parcsxArc *  parcs 
) )
-
- - - - - -
-   - + +
+

Render list of filled arcs, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of filled arcs, parcs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyFillRect ( DrawablePtr  pDrawable, void dmxPolyFillRect (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nrectFill, int  nrectFill,
xRectangle *  prectInitxRectangle *  prectInit 
) )
-
- - - - - -
-   - + +
+

Render list of filled rectangles, prectInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of filled rectangles, prectInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyGlyphBlt ( DrawablePtr  pDrawable, void dmxPolyGlyphBlt (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
unsigned int  nglyph, unsigned int  nglyph,
CharInfoPtr *  ppci, CharInfoPtr *  ppci,
pointer  pglyphBasepointer  pglyphBase 
) )
-
- - - - - -
-   - + +
+

Poly Glyph Blt -- this function should never be called.

-

-Poly Glyph Blt -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolylines ( DrawablePtr  pDrawable, void dmxPolylines (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  mode, int  mode,
int  npt, int  npt,
DDXPointPtr  pptInitDDXPointPtr  pptInit 
) )
-
- - - - - -
-   - + +
+

Render list of connected lines, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of connected lines, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyPoint ( DrawablePtr  pDrawable, void dmxPolyPoint (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  mode, int  mode,
int  npt, int  npt,
DDXPointPtr  pptInitDDXPointPtr  pptInit 
) )
-
- - - - - -
-   - + +
+

Render list of points, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of points, pptInit in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolyRectangle ( DrawablePtr  pDrawable, void dmxPolyRectangle (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nrects, int  nrects,
xRectangle *  pRectsxRectangle *  pRects 
) )
-
- - - - - -
-   - + +
+

Render list of rectangle outlines, pRects in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of rectangle outlines, pRects in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPolySegment ( DrawablePtr  pDrawable, void dmxPolySegment (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  nseg, int  nseg,
xSegment *  pSegsxSegment *  pSegs 
) )
-
- - - - - -
-   - + +
+

Render list of disjoint segments, pSegs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render list of disjoint segments, pSegs in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPolyText16 ( DrawablePtr  pDrawable, int dmxPolyText16 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
unsigned short *  charsunsigned short *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 16-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 16-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPolyText8 ( DrawablePtr  pDrawable, int dmxPolyText8 (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  x, int  x,
int  y, int  y,
int  count, int  count,
char *  charschar *  chars 
) )
-
- - - - - -
-   - + +
+

Render string of 8-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

-Render string of 8-bit chars (foreground only) in pDrawable on the back-end server associated with pDrawable's screen. If the offscreen optimization is enabled, only draw when pDrawable is at least partially visible.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPushPixels ( GCPtr  pGC, void dmxPushPixels (GCPtr  pGC,
PixmapPtr  pBitMap, PixmapPtr  pBitMap,
DrawablePtr  pDst, DrawablePtr  pDst,
int  w, int  w,
int  h, int  h,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - + +
+

Push Pixels -- this function should never be called.

-

-Push Pixels -- this function should never be called.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPutImage ( DrawablePtr  pDrawable, void dmxPutImage (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
int  depth, int  depth,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  h, int  h,
int  leftPad, int  leftPad,
int  format, int  format,
char *  pBitschar *  pBits 
) )
-
- - - - - -
-   - + +
+

Transfer pBits image to back-end server associated with pDrawable's screen. If primitive subdivision optimization is enabled, then only transfer the sections of pBits that are visible (i.e., not-clipped) to the back-end server.

-

-Transfer pBits image to back-end server associated with pDrawable's screen. If primitive subdivision optimization is enabled, then only transfer the sections of pBits that are visible (i.e., not-clipped) to the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, DMX_GCOPS_OFFSCREEN, DMX_GCOPS_SET_DRAWABLE, DMX_GET_GC_PRIV, dmxScreens, dmxSubdividePrimitives, dmxSync(), and _dmxGCPriv::gc.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxSetSpans ( DrawablePtr  pDrawable, void dmxSetSpans (DrawablePtr  pDrawable,
GCPtr  pGC, GCPtr  pGC,
char *  psrc, char *  psrc,
DDXPointPtr  ppt, DDXPointPtr  ppt,
int *  pwidth, int *  pwidth,
int  nspans, int  nspans,
int  fSortedint  fSorted 
) )
-
- - - - - -
-   - + +
+

Set spans -- this function should never be called.

-

-Set spans -- this function should never be called.

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html new file mode 100644 index 000000000..bfa4842ec --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html @@ -0,0 +1,128 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxinit_8c.html index 22928e654..314910174 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinit_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxinit_8c.html @@ -6,695 +6,877 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinit.c File Reference

#include "dmx.h"
-#include "dmxinit.h"
-#include "dmxsync.h"
-#include "dmxlog.h"
-#include "dmxinput.h"
-#include "dmxscrinit.h"
-#include "dmxcursor.h"
-#include "dmxfont.h"
-#include "config/dmxconfig.h"
-#include "dmxcb.h"
-#include "dmxprop.h"
-#include "dmxstat.h"
-#include "dmxpict.h"
-#include "Xos.h"
-#include "dixstruct.h"
-#include "panoramiXsrv.h"
-#include <signal.h>
- - - - + + +
+

dmxinit.c File Reference

#include "dmx.h"
+#include "dmxinit.h"
+#include "dmxsync.h"
+#include "dmxlog.h"
+#include "dmxinput.h"
+#include "dmxscrinit.h"
+#include "dmxcursor.h"
+#include "dmxfont.h"
+#include "config/dmxconfig.h"
+#include "dmxcb.h"
+#include "dmxprop.h"
+#include "dmxstat.h"
+#include "dmxpict.h"
+#include <X11/Xos.h>
+#include "dixstruct.h"
+#include <signal.h>
+

Functions

void InitOutput (ScreenInfo *pScreenInfo, int argc, char *argv[])
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_ERROR_BUF_SIZE   256

Functions

static int dmxErrorHandler (Display *dpy, XErrorEvent *ev)
Bool dmxOpenDisplay (DMXScreenInfo *dmxScreen)
void dmxSetErrorHandler (DMXScreenInfo *dmxScreen)
static void dmxPrintScreenInfo (DMXScreenInfo *dmxScreen)
void dmxGetScreenAttribs (DMXScreenInfo *dmxScreen)
Bool dmxGetVisualInfo (DMXScreenInfo *dmxScreen)
void dmxGetColormaps (DMXScreenInfo *dmxScreen)
void dmxGetPixmapFormats (DMXScreenInfo *dmxScreen)
static Bool dmxSetPixmapFormats (ScreenInfo *pScreenInfo, DMXScreenInfo *dmxScreen)
void dmxCheckForWM (DMXScreenInfo *dmxScreen)
static void dmxDisplayInit (DMXScreenInfo *dmxScreen)
static const char * dmxExecOS (void)
static const char * dmxBuildCompiler (void)
static const char * dmxExecHost (void)
void InitOutput (ScreenInfo *pScreenInfo, int argc, char *argv[])
static void dmxSetDefaultFontPath (char *fp)
void AbortDDX (void)
void ddxGiveUp (void)
void OsVendorInit (void)
void OsVendorFatalError (void)
int ddxProcessArgument (int argc, char *argv[], int i)
void ddxUseMsg (void)

Variables

int dmxNumScreens
DMXScreenInfo * dmxScreens
int dmxNumInputs
DMXInputInfo * dmxInputs
int dmxShadowFB = FALSE
XErrorEvent dmxLastErrorEvent
Bool dmxErrorOccurred = FALSE
char * dmxFontPath = NULL
Bool dmxOffScreenOpt = TRUE
Bool dmxSubdividePrimitives = TRUE
Bool dmxLazyWindowCreation = TRUE
Bool dmxUseXKB = TRUE
int dmxDepth = 0
static Bool dmxGLXProxy = FALSE
Bool dmxIgnoreBadFontPaths = FALSE
Bool dmxAddRemoveScreens = FALSE
+

Detailed Description

+

Provide expected functions for initialization from the ddx layer and global variables for the DMX server.

+

Define Documentation

+ +
+
+ + + + +
#define DMX_ERROR_BUF_SIZE   256
+
+
+ +

Referenced by dmxErrorHandler().

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + +
void AbortDDX (void  ) 
+
+
+

This function is called in Xserver/os/utils.c from AbortServer(). We must ensure that backend and console state is restored in the event the server shutdown wasn't clean.

-
void AbortDDX (void)
void ddxGiveUp (void)
void OsVendorInit (void)
+ + + + + + + + +
void ddxGiveUp (void  ) 
+ +

+

This function is called in Xserver/dix/main.c from main() when dispatchException & DE_TERMINATE (which is the only way to exit the main loop without an interruption.

+ +

References AbortDDX().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
int ddxProcessArgument (int  argc,
char *  argv[],
int  i 
)
+
+
+

Process our command line arguments.

+ +

References dmxAddRemoveScreens, dmxConfigSetMaxScreens(), dmxConfigSetXkbLayout(), dmxConfigSetXkbModel(), dmxConfigSetXkbOptions(), dmxConfigSetXkbRules(), dmxConfigSetXkbVariant(), dmxConfigStoreConfig(), dmxConfigStoreDisplay(), dmxConfigStoreFile(), dmxConfigStoreInput(), dmxConfigStoreXInput(), dmxCursorNoMulti(), dmxDepth, dmxGLXProxy, dmxIgnoreBadFontPaths, dmxLazyWindowCreation, dmxLog(), dmxOffScreenOpt, dmxSetDefaultFontPath(), dmxShadowFB, dmxStatActivate(), dmxSubdividePrimitives, dmxSyncActivate(), dmxUseXKB, and dmxWarning.

+ +
+
+ +
+
+ + + + + + + + + +
void ddxUseMsg (void  ) 
+
+
+

Provide succinct usage information for the DMX server.

+ +
+
+ +
+
+ + + + + + + + + +
static const char* dmxBuildCompiler (void  )  [static]
+
+
-
void OsVendorFatalError (void)
int ddxProcessArgument (int argc, char *argv[], int i)
+ + + + + + + + +
void dmxCheckForWM (DMXScreenInfo *  dmxScreen ) 
+ +

-
void ddxUseMsg (void)
CARD32 GetTimeInMillis (void)

Variables

int dmxNumScreens
+ + + + + + + + +
static void dmxDisplayInit (DMXScreenInfo *  dmxScreen )  [static]
+ +

+

Initialize the display and collect relevant information about the display properties

-DMXScreenInfo * dmxScreens +

References dmxCheckForWM(), dmxFatal, dmxGetColormaps(), dmxGetPixmapFormats(), dmxGetScreenAttribs(), dmxGetVisualInfo(), dmxLog(), dmxOpenDisplay(), dmxSetErrorHandler(), and _DMXScreenInfo::name.

-int dmxNumInputs +

Referenced by InitOutput().

-DMXInputInfo * dmxInputs +
+ + +
+
+ + + + + + + + + + + + + + + + + + +
static int dmxErrorHandler (Display *  dpy,
XErrorEvent *  ev 
) [static]
+
+
-int dmxShadowFB = FALSE +

References DMX_ERROR_BUF_SIZE, dmxErrorOccurred, dmxLastErrorEvent, dmxLog(), and dmxWarning.

-XErrorEvent dmxLastErrorEvent +

Referenced by dmxSetErrorHandler().

-Bool dmxErrorOccurred = FALSE +
+
+ +
+
+ + + + + + + + + +
static const char* dmxExecHost (void  )  [static]
+
+
-char * dmxFontPath = NULL +

Referenced by InitOutput().

-Bool dmxOffScreenOpt = TRUE +
+
+ +
+
+ + + + + + + + + +
static const char* dmxExecOS (void  )  [static]
+
+
-Bool dmxSubdividePrimitives = TRUE +

Referenced by InitOutput().

-Bool dmxLazyWindowCreation = TRUE +
+
+ +
+
+ + + + + + + + + +
void dmxGetColormaps (DMXScreenInfo *  dmxScreen ) 
+
+
-Bool dmxUseXKB = TRUE +

References _DMXScreenInfo::beBlackPixel, _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, and _DMXScreenInfo::beWhitePixel.

-int dmxDepth = 0 +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

-Bool dmxNoRender = FALSE +
+
+ +
+
+ + + + + + + + + +
void dmxGetPixmapFormats (DMXScreenInfo *  dmxScreen ) 
+
+
-Bool dmxIgnoreBadFontPaths = FALSE +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, and _DMXScreenInfo::bePixmapFormats.

-Bool dmxAddRemoveScreens = FALSE +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

- -

Detailed Description

-Provide expected functions for initialization from the ddx layer and global variables for the DMX server.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
void AbortDDX ( void   ) void dmxGetScreenAttribs (DMXScreenInfo *  dmxScreen ) 
+ +
+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, _DMXScreenInfo::beXDPI, _DMXScreenInfo::beYDPI, dmxLogOutput(), dmxLogOutputWarning(), dmxPrintScreenInfo(), _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnXSign, _DMXScreenInfo::scrnY, and _DMXScreenInfo::scrnYSign.

+

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+ + +
+
+ + + + + + + + +
Bool dmxGetVisualInfo (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - - -

-This function is called in Xserver/os/utils.c from AbortServer(). We must ensure that backend and console state is restored in the event the server shutdown wasn't clean.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, dmxDepth, and dmxLogVisual().

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void ddxGiveUp ( void   ) Bool dmxOpenDisplay (DMXScreenInfo *  dmxScreen ) 
+ +
+ +

References _DMXScreenInfo::beDisplay, dmxPropertyDisplay(), and _DMXScreenInfo::name.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+
+ + +
+
+ + + + + + + + +
static void dmxPrintScreenInfo (DMXScreenInfo *  dmxScreen )  [static]
-
- - - - - -
-   - - -

-This function is called in Xserver/dix/main.c from main() when dispatchException & DE_TERMINATE (which is the only way to exit the main loop without an interruption.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, dmxLogOutput(), dmxLogOutputCont(), dmxLogOutputWarning(), and _DMXScreenInfo::WMRunningOnBE.

+ +

Referenced by dmxGetScreenAttribs().

+ +
+ + +
+
+
- - - - + + + + + + +
int ddxProcessArgument ( int  argc, static void dmxSetDefaultFontPath (char *  fp )  [static]
+ +
+ +

References dmxFontPath.

+ +

Referenced by ddxProcessArgument().

+ +
+ + +
+
+ + + + + + - - - +
void dmxSetErrorHandler (DMXScreenInfo *  dmxScreen )  char *  argv[],
+
+
+ +

References dmxErrorHandler().

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ - - - - + + + + + - - + + - -
int  istatic Bool dmxSetPixmapFormats (ScreenInfo *  pScreenInfo,
) DMXScreenInfo *  dmxScreen 
-
- - - - - -
-   - - -

-Process our command line arguments.

-

- - - - -
- - - - - - - + + + -
void ddxUseMsg ( void   ) ) [static]
-
- - - - - -
-   - - -

-Provide succinct usage information for the DMX server.

-

- - - - -
- - - - - - - - - + +
-
CARD32 GetTimeInMillis ( void   ) 
-
- - - - - -
-   - - -

-Return wall-clock time in milliseconds.

-

- - - - -
- +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, and _DMXScreenInfo::bePixmapFormats.

+ +

Referenced by InitOutput().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void InitOutput ( ScreenInfo *  pScreenInfo, void InitOutput (ScreenInfo *  pScreenInfo,
int  argc, int  argc,
char *  argv[]char *  argv[] 
) )
-
- - - - - -
-   - - -

-This routine is called in Xserver/dix/main.c from main().

-

- - - - -
- + +
+

This routine is called in Xserver/dix/main.c from main().

+ +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, DMX_NO_RECOMPUTE_BOUNDING_BOX, dmxAddRemoveScreens, dmxBuildCompiler(), dmxComputeWidthHeight(), dmxConfigConfigure(), dmxConnectionBlockCallback(), dmxDisplayInit(), dmxExecHost(), dmxExecOS(), dmxFatal, dmxGeneration, dmxGLXProxy, dmxInfo, dmxInitFonts(), dmxInitOrigins(), dmxInitOverlap(), dmxInitRender(), dmxInputFree(), dmxLazyWindowCreation, dmxLog(), dmxNumInputs, dmxNumScreens, dmxOffScreenOpt, dmxScreenInit(), dmxSetPixmapFormats(), dmxShadowFB, dmxStatFree(), dmxStatInit(), dmxSyncInit(), dmxWarning, GetGLXFBConfigs(), GetGLXVisualConfigs(), GetGLXVisualConfigsFromFBConfigs(), _DMXScreenInfo::stat, VENDOR_RELEASE, VENDOR_STRING, dmxGlxVisualPrivate::x_visual_class, and dmxGlxVisualPrivate::x_visual_depth.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void OsVendorFatalError ( void   ) void OsVendorFatalError (void  ) 
-
- - - - - -
-   - - -

-This function is called in Xserver/os/utils.c from FatalError() and VFatalError(). (Note that setting the function pointer OsVendorVErrorFProc will cause VErrorF() (which is called by the two routines mentioned here, as well as by others) to use the referenced routine instead of vfprintf().)

-

- - - - -
- + +
+

This function is called in Xserver/os/utils.c from FatalError() and VFatalError(). (Note that setting the function pointer OsVendorVErrorFProc will cause VErrorF() (which is called by the two routines mentioned here, as well as by others) to use the referenced routine instead of vfprintf().)

+ +

Referenced by VFatalError().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void OsVendorInit ( void   ) void OsVendorInit (void  ) 
-
- - - - - -
-   - - -

-This function is called in Xserver/os/osinit.c from OsInit().

-

Variable Documentation

-

- - - - -
- + +
+

This function is called in Xserver/os/osinit.c from OsInit().

+ +
+ +

Variable Documentation

+ +
+
+
- +
Bool dmxAddRemoveScreens = FALSE + Bool dmxAddRemoveScreens = FALSE
-
- - - - - -
-   - - -

-True if add and remove screens support is enabled

-

- - - - -
- + +
+

True if add and remove screens support is enabled

+ +

Referenced by ddxProcessArgument(), dmxAttachScreen(), dmxDetachScreen(), and InitOutput().

+ +
+ + +
+
+
- +
int dmxDepth = 0 + int dmxDepth = 0
-
- - - - - -
-   - - -

-Requested depth if non-zero

-

- - - - -
- + +
+

Requested depth if non-zero

+ +

Referenced by ddxProcessArgument(), and dmxGetVisualInfo().

+ +
+ + +
+
+
- +
Bool dmxErrorOccurred = FALSE + Bool dmxErrorOccurred = FALSE
-
- - - - - -
-   - - -

-True if an error occurred

-

- - - - -
- + +
+

True if an error occurred

+ +

Referenced by dmxErrorHandler().

+ +
+ + +
+
+
- +
char* dmxFontPath = NULL + char* dmxFontPath = NULL
-
- - - - - -
-   - - -

-NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths

-

- - - - -
- + +
+

NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths

+ +

Referenced by dmxBELoadFont(), and dmxSetDefaultFontPath().

+ +
+ + +
+
+
- +
Bool dmxIgnoreBadFontPaths = FALSE + Bool dmxGLXProxy = FALSE [static]
-
- - - - - -
-   - - -

-True if bad font paths should be ignored during server init

-

- - - - -
- + +
+ +

Referenced by ddxProcessArgument(), and InitOutput().

+ +
+ + +
+
+
- +
DMXInputInfo* dmxInputs + Bool dmxIgnoreBadFontPaths = FALSE
-
- - - - - -
-   - - -

-List of inputs

-

- - - - -
- + +
+

True if bad font paths should be ignored during server init

+ +

Referenced by ddxProcessArgument(), and dmxBELoadFont().

+ +
+ + +
+
+
- +
XErrorEvent dmxLastErrorEvent + DMXInputInfo* dmxInputs
-
- - - - - -
-   - - -

-Last error that occurred

-

- - - - -
- + +
+

List of inputs

+ +

Referenced by dmxAddDevice(), dmxAdjustCursorBoundaries(), dmxBackendInitPrivate(), dmxBlockHandler(), dmxChangePointerControl(), dmxCheckFunctionKeys(), dmxCommonCopyPrivate(), dmxConfigAddInput(), dmxConsoleInit(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxGetInputCount(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputDetach(), dmxInputDetachAll(), dmxInputLocateId(), dmxInputLogDevices(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxSigioDisableInput(), dmxSigioEnableInput(), dmxSigioHandler(), dmxTranslateAndEnqueueExtEvent(), dmxUpdateWindowInfo(), dmxWakeupHandler(), InitInput(), and ProcessInputEvents().

+ +
+ + +
+
+
- +
Bool dmxLazyWindowCreation = TRUE + XErrorEvent dmxLastErrorEvent
-
- - - - - -
-   - - -

-True if using the lazy window creation optimization

-

- - - - -
- + +
+

Last error that occurred

+ +

Referenced by dmxErrorHandler().

+ +
+ + +
+
+
- +
Bool dmxNoRender = FALSE + Bool dmxLazyWindowCreation = TRUE
-
- - - - - -
-   - - -

-True if the RENDER extension should be disabled

-

- - - - -
- + +
+

True if using the lazy window creation optimization

+ +

Referenced by ddxProcessArgument(), dmxCreateWindow(), and InitOutput().

+ +
+ + +
+
+
- +
int dmxNumInputs + int dmxNumInputs
-
- - - - - -
-   - - -

-Number of dmxInputs

-

- - - - -
- + +
+

Number of dmxInputs

+ +

Referenced by dmxAdjustCursorBoundaries(), dmxChangePointerControl(), dmxConfigAddInput(), dmxConfigConfigInputs(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxGetInputCount(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputDetach(), dmxInputDetachAll(), dmxInputLocateId(), dmxInputLogDevices(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxSigioDisableInput(), dmxSigioEnableInput(), dmxSigioHandler(), dmxUpdateWindowInfo(), InitInput(), InitOutput(), and ProcessInputEvents().

+ +
+ + +
+
+
- +
int dmxNumScreens + int dmxNumScreens
-
- - - - - -
-   - - -

-Number of dmxScreens

-

- - - - -
- + +
+

Number of dmxScreens

+ +

Referenced by AbortDDX(), dmxBackendInitPrivate(), dmxBackendSameDisplay(), dmxCheckCursor(), dmxComputeScreenOrigins(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigConfigInputs(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConfigSetMaxScreens(), dmxConsoleComputeWidthHeight(), dmxConsoleDraw(), dmxConsoleDrawWindows(), dmxCursorOffScreen(), dmxFindFirstScreen(), dmxFindPointerScreen(), dmxGetNumScreens(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxInitOverlap(), dmxInputAttachBackend(), dmxInputInit(), dmxProcRenderAddGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcSetFontPath(), dmxPropertyCheckOtherWindows(), dmxReInitOrigins(), dmxSLCreate(), dmxSLFindNext(), dmxStatCallback(), dmxSyncCallback(), dmxTryComputeScreenOrigins(), and InitOutput().

+ +
+ + +
+
+
- +
Bool dmxOffScreenOpt = TRUE + Bool dmxOffScreenOpt = TRUE
-
- - - - - -
-   - - -

-True if using off screen optimizations

-

- - - - -
- + +
+

True if using off screen optimizations

+ +

Referenced by ddxProcessArgument(), and InitOutput().

+ +
+ + +
+
+
- +
DMXScreenInfo* dmxScreens + DMXScreenInfo* dmxScreens
-
- - - - - -
-   - - -

-List of outputs

-

- - - - -
- + +
+

List of outputs

+ +

Referenced by _dmxMoveCursor(), _dmxRealizeCursor(), _dmxSetCursor(), _dmxUnrealizeCursor(), dmxAttachScreen(), dmxBackendFindOverlapping(), dmxBackendInitPrivate(), dmxBackendOffscreen(), dmxBackendProcessInput(), dmxBackendUpdatePosition(), dmxBECloseScreen(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBECreateGC(), dmxBECreateGlyphSet(), dmxBECreatePixmap(), dmxBECreateWindowTree(), dmxBEDestroyWindow(), dmxBEFreeColormap(), dmxBEFreeCursor(), dmxBEFreeFont(), dmxBEFreeGC(), dmxBEFreeGlyphSet(), dmxBEFreePicture(), dmxBEFreePixmap(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBESavePixmap(), dmxBEScreenInit(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeClip(), dmxChangeGC(), dmxChangePicture(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCheckCursor(), dmxCloseScreen(), dmxColormapFromDefaultVisual(), dmxCommonMouOn(), dmxCommonSaveState(), dmxComposite(), dmxCompositeRects(), dmxComputeScreenOrigins(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigConfigInputs(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConnectionBlockCallback(), dmxConsoleDraw(), dmxCopyArea(), dmxCopyGC(), dmxCopyPlane(), dmxCopyWindow(), dmxCoreMotion(), dmxCreateAndRealizeWindow(), dmxCreateColormap(), dmxCreateGC(), dmxCreateNonRootWindow(), dmxCreatePicture(), dmxCreatePixmap(), dmxCreateRootWindow(), dmxCreateWindow(), dmxCursorOffScreen(), dmxDestroyClip(), dmxDestroyColormap(), dmxDestroyGC(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxDetachScreen(), dmxDoCreatePicture(), dmxDoRestackWindow(), dmxDoSetShape(), dmxFillPolygon(), dmxFindAlternatePixmap(), dmxFindFirstScreen(), dmxGetImage(), dmxGetScreenAttributes(), dmxImageText16(), dmxImageText8(), dmxInitOrigins(), dmxInitOverlap(), dmxInputAttachBackend(), dmxInputInit(), dmxInstallColormap(), dmxLookupVisual(), dmxLookupVisualFromID(), dmxMoveCursor(), dmxPictureInit(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPositionWindow(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxProcSetFontPath(), dmxPropertyCheckOtherWindows(), dmxPutImage(), dmxRealizeCursor(), dmxRealizeFont(), dmxRealizeWindow(), dmxReInitOrigins(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeScreenWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxScreenInit(), dmxSetCursor(), dmxSetShape(), dmxShadowUpdateProc(), dmxStatCallback(), dmxStoreColors(), dmxSyncCallback(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxTryComputeScreenOrigins(), dmxUnrealizeCursor(), dmxUnrealizeFont(), dmxUnrealizeWindow(), dmxUpdateScreenResources(), dmxValidatePicture(), and dmxWindowExposures().

+ +
+ + +
+
+
- +
int dmxShadowFB = FALSE + int dmxShadowFB = FALSE
-
- - - - - -
-   - - -

-Non-zero if using shadow frame-buffer (deprecated)

-

- - - - -
- + +
+

Non-zero if using shadow frame-buffer (deprecated)

+ +

Referenced by ddxProcessArgument(), dmxBECloseScreen(), dmxBEScreenInit(), dmxCloseScreen(), dmxCommonMouOn(), dmxPictureInit(), dmxScreenInit(), and InitOutput().

+ +
+ + +
+
+
- +
Bool dmxSubdividePrimitives = TRUE + Bool dmxSubdividePrimitives = TRUE
-
- - - - - -
-   - - -

-True if using the primitive subdivision optimization

-

- - - - -
- + +
+

True if using the primitive subdivision optimization

+ +

Referenced by ddxProcessArgument(), and dmxPutImage().

+ +
+ + +
+
+
- +
Bool dmxUseXKB = TRUE + Bool dmxUseXKB = TRUE
-
- - - - - -
-   - - -

-True if the XKB extension should be used with the backend servers

+

+
+

True if the XKB extension should be used with the backend servers

+ +

Referenced by ddxProcessArgument(), and dmxCommonSaveState().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html deleted file mode 100644 index 3217ef4cb..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinit.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2004 Red Hat Inc., Raleigh, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXINIT_H
-00039 #define DMXINIT_H
-00040 
-00041 #include "scrnintstr.h"
-00042 
-00043 extern Bool dmxOpenDisplay(DMXScreenInfo *dmxScreen);
-00044 extern void dmxSetErrorHandler(DMXScreenInfo *dmxScreen);
-00045 extern void dmxCheckForWM(DMXScreenInfo *dmxScreen);
-00046 extern void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen);
-00047 extern Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen);
-00048 extern void dmxGetColormaps(DMXScreenInfo *dmxScreen);
-00049 extern void dmxGetPixmapFormats(DMXScreenInfo *dmxScreen);
-00050 
-00051 #endif /* DMXINIT_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h.html index 2890be2c6..b83e29690 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinit_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxinit_8h.html @@ -6,16 +6,195 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinit.h File Reference

#include "scrnintstr.h"
+ + +
+

dmxinit.h File Reference

#include "scrnintstr.h"
-

-Go to the source code of this file. - +

Go to the source code of this file.

+
+ + + + + + + +

Functions

Bool dmxOpenDisplay (DMXScreenInfo *dmxScreen)
void dmxSetErrorHandler (DMXScreenInfo *dmxScreen)
void dmxCheckForWM (DMXScreenInfo *dmxScreen)
void dmxGetScreenAttribs (DMXScreenInfo *dmxScreen)
Bool dmxGetVisualInfo (DMXScreenInfo *dmxScreen)
void dmxGetColormaps (DMXScreenInfo *dmxScreen)
void dmxGetPixmapFormats (DMXScreenInfo *dmxScreen)
-

Detailed Description

-Interface for initialization.
See also:
dmxinit.c
+

Detailed Description

+

Interface for initialization.

+
See also:
dmxinit.c
+

Function Documentation

+ +
+
+ + + + + + + + + +
void dmxCheckForWM (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beDisplay, and _DMXScreenInfo::WMRunningOnBE.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxGetColormaps (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beBlackPixel, _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, and _DMXScreenInfo::beWhitePixel.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxGetPixmapFormats (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, and _DMXScreenInfo::bePixmapFormats.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxGetScreenAttribs (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDepth, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beHeight, _DMXScreenInfo::beWidth, _DMXScreenInfo::beXDPI, _DMXScreenInfo::beYDPI, dmxLogOutput(), dmxLogOutputWarning(), dmxPrintScreenInfo(), _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnXSign, _DMXScreenInfo::scrnY, and _DMXScreenInfo::scrnYSign.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
Bool dmxGetVisualInfo (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, dmxDepth, and dmxLogVisual().

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
Bool dmxOpenDisplay (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References _DMXScreenInfo::beDisplay, dmxPropertyDisplay(), and _DMXScreenInfo::name.

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxSetErrorHandler (DMXScreenInfo *  dmxScreen ) 
+
+
+ +

References dmxErrorHandler().

+ +

Referenced by dmxAttachScreen(), and dmxDisplayInit().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html new file mode 100644 index 000000000..bb6ba7f8d --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html @@ -0,0 +1,83 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8c.html b/xorg-server/hw/dmx/doc/html/dmxinput_8c.html index 09a5ddd05..d53bd7643 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinput_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxinput_8c.html @@ -6,171 +6,201 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinput.c File Reference

#include "dmx.h"
-#include "dmxlog.h"
-#include "dmxinput.h"
-#include "inputstr.h"
-#include "input.h"
- - - - + + +
+

dmxinput.c File Reference

#include "dmx.h"
+#include "dmxlog.h"
+#include "dmxinput.h"
+#include "inputstr.h"
+#include "input.h"
+#include "mi.h"
+

Functions

Bool LegalModifier (unsigned int key, DevicePtr pDev)
+ + + + + + + +

Functions

Bool LegalModifier (unsigned int key, DeviceIntPtr pDev)
void InitInput (int argc, char **argv)
void ProcessInputEvents (void)
void dmxUpdateWindowInfo (DMXUpdateType type, WindowPtr pWindow)
int NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
void DeleteInputDeviceRequest (DeviceIntPtr pDev)
+

Detailed Description

+

Provide the main entry points for input initialization and processing that arequired by the dix layer.

+

Function Documentation

+ +
+
+ + + + + + + + + +
void DeleteInputDeviceRequest (DeviceIntPtr  pDev ) 
+
+
-void InitInput (int argc, char **argv) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxUpdateWindowInfo (DMXUpdateType  type,
WindowPtr  pWindow 
)
+
+
+

This routine is called from dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.

-void ProcessInputEvents (void) +

References _DMXInputInfo::detached, dmxInputs, dmxNumInputs, and _DMXInputInfo::updateWindowInfo.

-void dmxUpdateWindowInfo (DMXUpdateType type, WindowPtr pWindow) +

Referenced by dmxCopyWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), and dmxUnrealizeWindow().

- -

Detailed Description

-Provide the main entry points for input initialization and processing that arequired by the dix layer.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxUpdateWindowInfo ( DMXUpdateType  type, void InitInput (int  argc,
WindowPtr  pWindowchar **  argv 
) )
-
- - - - - -
-   - + +
+

Called from dix/main.c on each server generation to initialize inputs. All the work is done in dmxInputInit.

+
See also:
dmxInputInit()
-

-This routine is called from #dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.

-

- - - - -
- +

References dmxFatal, dmxInputInit(), dmxInputs, dmxLog(), and dmxNumInputs.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void InitInput ( int  argc, Bool LegalModifier (unsigned int  key,
char **  argvDeviceIntPtr  pDev 
) )
-
- - - - - -
-   - + +
+

Returns TRUE if the key is a valid modifier. For PC-class keyboards, all keys can be used as modifiers, so return TRUE always.

-

-Called from dix/main.c on each server generation to initialize inputs. All the work is done in dmxInputInit.

See also:
dmxInputInit()
-
-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool LegalModifier ( unsigned int  key, int NewInputDeviceRequest (InputOption *  options,
DevicePtr  pDevDeviceIntPtr *  pdev 
) )
-
- - - - - -
-   - + +
-

-Returns TRUE if the key is a valid modifier. For PC-class keyboards, all keys can be used as modifiers, so return TRUE always.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
void ProcessInputEvents ( void   ) void ProcessInputEvents (void  ) 
-
- - - - - -
-   - + +
+

Called from dix/dispatch.c in Dispatch() whenever input events require processing. All the work is done in the lower level routines.

-

-Called from dix/dispatch.c in Dispatch() whenever input events require processing. All the work is done in the lower level routines.

+

References _DMXInputInfo::detached, dmxInputs, dmxNumInputs, and _DMXInputInfo::processInputEvents.

+ +

Referenced by dmxCoreMotion().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html deleted file mode 100644 index 013912f37..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinput.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   David H. Dawes <dawes@xfree86.org>
-00032  *   Kevin E. Martin <kem@redhat.com>
-00033  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00034  *
-00035  */
-00036 
-00048 #ifndef DMXINPUT_H
-00049 #define DMXINPUT_H
-00050 
-00052 #define DMX_MAX_SIGIO_FDS 4
-00053 
-00054 struct _DMXInputInfo;
-00055 
-00057 typedef enum {
-00058     DMX_UPDATE_REALIZE,         
-00059     DMX_UPDATE_UNREALIZE,       
-00060     DMX_UPDATE_RESTACK,         
-00061     DMX_UPDATE_COPY,            
-00062     DMX_UPDATE_RESIZE,          
-00063     DMX_UPDATE_REPARENT         
-00064 } DMXUpdateType;
-00065 
-00066 typedef void (*ProcessInputEventsProc)(struct _DMXInputInfo *);
-00067 typedef void (*UpdateWindowInfoProc)(struct _DMXInputInfo *,
-00068                                      DMXUpdateType, WindowPtr);
-00069 
-00071 typedef struct _DMXLocalInputInfo *DMXLocalInputInfoPtr;
-00072 
-00074 typedef enum {
-00075     DMX_NOSIGIO = 0,            
-00076     DMX_USESIGIO,               
-00079     DMX_ACTIVESIGIO             
-00080 } dmxSigioState;
-00081 
-00085 struct _DMXInputInfo {
-00086     const char              *name; 
-00089     Bool                    freename; 
-00090     Bool                    detached; 
-00091     int                     inputIdx; 
-00092     int                     scrnIdx;  
-00093     Bool                    core;  
-00096     Bool                    console; 
-00100     Bool                    windows; 
-00103     ProcessInputEventsProc  processInputEvents;
-00104     UpdateWindowInfoProc    updateWindowInfo;
-00105 
-00106                                 /* Local input information */
-00107     dmxSigioState           sigioState;    
-00108     int                     sigioFdCount;  
-00109     int                     sigioFd[DMX_MAX_SIGIO_FDS];    
-00110     Bool                    sigioAdded[DMX_MAX_SIGIO_FDS]; 
-00114     int                     vt_switch_pending;
-00115 
-00117     int                     vt_switched;
-00118 
-00120     int                     numDevs;
-00121 
-00126     DMXLocalInputInfoPtr    *devs;
-00127 
-00128     char                    *keycodes; 
-00129     char                    *symbols;  
-00130     char                    *geometry; 
-00131 };
-00132 
-00133 extern int                  dmxNumInputs; 
-00134 extern DMXInputInfo         *dmxInputs;   
-00136 extern void dmxInputInit(DMXInputInfo *dmxInput);
-00137 extern void dmxInputReInit(DMXInputInfo *dmxInput);
-00138 extern void dmxInputLateReInit(DMXInputInfo *dmxInput);
-00139 extern void dmxInputFree(DMXInputInfo *dmxInput);
-00140 extern void dmxInputLogDevices(void);
-00141 extern void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow);
-00142 
-00143 /* These functions are defined in input/dmxeq.c */
-00144 extern Bool dmxeqInitialized(void);
-00145 extern void dmxeqEnqueue(xEvent *e);
-00146 extern void dmxeqSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
-00147 
-00148 /* This type is used in input/dmxevents.c.  Also, these functions are
-00149  * defined in input/dmxevents.c */
-00150 typedef enum {
-00151     DMX_NO_BLOCK = 0,
-00152     DMX_BLOCK    = 1
-00153 } DMXBlockType;
-00154 
-00155 extern void          dmxGetGlobalPosition(int *x, int *y);
-00156 extern DMXScreenInfo *dmxFindFirstScreen(int x, int y);
-00157 extern void          dmxCoreMotion(int x, int y, int delta,
-00158                                    DMXBlockType block);
-00159 
-00160 /* Support for dynamic addition of inputs.  This functions is defined in
-00161  * config/dmxconfig.c */
-00162 extern DMXInputInfo *dmxConfigAddInput(const char *name, int core);
-00163 #endif /* DMXINPUT_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h.html index fab2a374d..d2c887e08 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinput_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxinput_8h.html @@ -6,520 +6,577 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxinput.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - +

Referenced by dmxMapInsert(), and dmxMapLookup().

- + + + +
+
+

Data Structures

struct  _DMXInputInfo

Defines

#define DMX_MAX_SIGIO_FDS   4

Typedefs

typedef _DMXLocalInputInfo * DMXLocalInputInfoPtr

Enumerations

enum  DMXUpdateType {
-  DMX_UPDATE_REALIZE, -DMX_UPDATE_UNREALIZE, -DMX_UPDATE_RESTACK, -DMX_UPDATE_COPY, -
-  DMX_UPDATE_RESIZE, -DMX_UPDATE_REPARENT -
+

Go to the source code of this file.

+ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  _DMXInputInfo

Defines

#define DMX_MAX_SIGIO_FDS   4

Typedefs

typedef void(* ProcessInputEventsProc )(struct _DMXInputInfo *)
typedef void(* UpdateWindowInfoProc )(struct _DMXInputInfo *, DMXUpdateType, WindowPtr)
typedef struct _DMXLocalInputInfo * DMXLocalInputInfoPtr

Enumerations

enum  DMXUpdateType {
+  DMX_UPDATE_REALIZE, +DMX_UPDATE_UNREALIZE, +DMX_UPDATE_RESTACK, +DMX_UPDATE_COPY, +
+  DMX_UPDATE_RESIZE, +DMX_UPDATE_REPARENT +
}
enum  dmxSigioState { DMX_NOSIGIO = 0, -DMX_USESIGIO, -DMX_ACTIVESIGIO +
enum  dmxSigioState { DMX_NOSIGIO = 0, +DMX_USESIGIO, +DMX_ACTIVESIGIO }

Functions

void dmxInputInit (DMXInputInfo *dmxInput)
void dmxInputReInit (DMXInputInfo *dmxInput)
void dmxInputLateReInit (DMXInputInfo *dmxInput)
void dmxInputFree (DMXInputInfo *dmxInput)
void dmxInputLogDevices (void)
void dmxUpdateWindowInfo (DMXUpdateType type, WindowPtr pWindow)
void dmxeqEnqueue (xEvent *e)
void dmxeqSwitchScreen (ScreenPtr pScreen, Bool fromDIX)
void dmxGetGlobalPosition (int *x, int *y)

Variables

int dmxNumInputs
DMXInputInfo * dmxInputs
-

Detailed Description

-This file provides access to:
    -
  • global variables available to all hw/dmx routines, and
  • enumerations and typedefs needed by input routines in hw/dmx (and hw/dmx/input).
-

-The goal is that no files in hw/dmx should include header files from hw/dmx/input -- the interface defined here should be the only interface exported to the hw/dmx layer.

See also:
input/dmxinputinit.c.
-

Define Documentation

-

- - - - -
- - - + + + + + + + + + + + + + + + +
#define DMX_MAX_SIGIO_FDS   4 +
enum  DMXBlockType { DMX_NO_BLOCK = 0, +DMX_BLOCK = 1 + }

Functions

void dmxInputInit (DMXInputInfo *dmxInput)
void dmxInputReInit (DMXInputInfo *dmxInput)
void dmxInputLateReInit (DMXInputInfo *dmxInput)
void dmxInputFree (DMXInputInfo *dmxInput)
void dmxInputLogDevices (void)
void dmxUpdateWindowInfo (DMXUpdateType type, WindowPtr pWindow)
void dmxeqSwitchScreen (DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)
void dmxGetGlobalPosition (int *x, int *y)
DMXScreenInfo * dmxFindFirstScreen (int x, int y)
void dmxCoreMotion (DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
DMXInputInfo * dmxConfigAddInput (const char *name, int core)

Variables

int dmxNumInputs
DMXInputInfo * dmxInputs
+

Detailed Description

+

This file provides access to:

+
    +
  • global variables available to all hw/dmx routines, and
    • +
  • enumerations and typedefs needed by input routines in hw/dmx (and hw/dmx/input).
    • +
+

The goal is that no files in hw/dmx should include header files from hw/dmx/input -- the interface defined here should be the only interface exported to the hw/dmx layer.

+
See also:
input/dmxinputinit.c.
+

Define Documentation

+ +
+
+ + + +
#define DMX_MAX_SIGIO_FDS   4
-
- - - - - -
-   - - -

-Maximum number of file descriptors for SIGIO handling

-

Typedef Documentation

-

- - - - +

Referenced by dmxMapClear(), dmxMapInsert(), and dmxMapLookup().

- + + + +
+
+
- - - - -
typedef struct _DMXLocalInputInfo* DMXLocalInputInfoPtr + +
+

Maximum number of file descriptors for SIGIO handling

+ +

Referenced by dmxSigioRegister().

+ +
+ +

Typedef Documentation

+ +
+
+ + + +
typedef struct _DMXLocalInputInfo* DMXLocalInputInfoPtr
-
- - - - - -
-   - - -

-An opaque structure that is only exposed in the dmx/input layer.

-

Enumeration Type Documentation

-

- - - + + + +
+
+
- - - - -
enum dmxSigioState + +
+

An opaque structure that is only exposed in the dmx/input layer.

+ +
+ + +
+
+ + + +
typedef void(* ProcessInputEventsProc)(struct _DMXInputInfo *)
-
- - - - - -
-   - - -

-State of the SIGIO engine

Enumeration values:
- - - - -
DMX_NOSIGIO  -Device does not use SIGIO at all.
DMX_USESIGIO  -Device can use SIGIO, but is not (e.g., because the VT is switch away).
DMX_ACTIVESIGIO  -Device is currently using SIGIO.
+ +
+ +
+ + +
+
+ + + + +
typedef void(* UpdateWindowInfoProc)(struct _DMXInputInfo *, DMXUpdateType, WindowPtr)
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum DMXBlockType
+
+
+
Enumerator:
+ + +
DMX_NO_BLOCK  +
DMX_BLOCK  +
+
-
-

- - - - -
- + + + + +
+
+
- +
enum DMXUpdateType + enum dmxSigioState
-
- - - - - -
-   - - -

-Reason why window layout was updated.

Enumeration values:
- - - - - - - -
DMX_UPDATE_REALIZE  -Window realized
DMX_UPDATE_UNREALIZE  -Window unrealized
DMX_UPDATE_RESTACK  -Stacking order changed
DMX_UPDATE_COPY  -Window copied
DMX_UPDATE_RESIZE  -Window resized
DMX_UPDATE_REPARENT  -Window reparented
+ +
+

State of the SIGIO engine

+
Enumerator:
+ + + +
DMX_NOSIGIO  +

Device does not use SIGIO at all.

+
DMX_USESIGIO  +

Device can use SIGIO, but is not (e.g., because the VT is switch away).

+
DMX_ACTIVESIGIO  +

Device is currently using SIGIO.

+
+
-
-

Function Documentation

-

- - - - -
- + + + + +
+
+
- - - - - - + +
void dmxeqEnqueue ( xEvent *  e  ) enum DMXUpdateType
+ +
+

Reason why window layout was updated.

+
Enumerator:
+ + + + + + +
DMX_UPDATE_REALIZE  +

Window realized

+
DMX_UPDATE_UNREALIZE  +

Window unrealized

+
DMX_UPDATE_RESTACK  +

Stacking order changed

+
DMX_UPDATE_COPY  +

Window copied

+
DMX_UPDATE_RESIZE  +

Window resized

+
DMX_UPDATE_REPARENT  +

Window reparented

+
+
+
+
+ +

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + +
DMXInputInfo* dmxConfigAddInput (const char *  name,
int  core 
)
-
- - - - - -
-   - - -

-This function adds an event to the end of the queue. If the event is an XInput event, then the next event (the valuator event) is also stored in the queue. If the new event has a time before the time of the last event currently on the queue, then the time is updated for the new event.

-Must be reentrant with ProcessInputEvents. Assumption: dmxeqEnqueue will never be interrupted. If this is called from both signal handlers and regular code, make sure the signal is suspended when called from regular code.

-

- - - - -
- + +
+ +

References _DMXInputInfo::core, dmxFatal, dmxInputs, dmxLog(), dmxNumInputs, _DMXInputInfo::inputIdx, _DMXInputInfo::name, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxConfigConfigInputs(), dmxInputAttachBackend(), and dmxInputAttachConsole().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + - - + + + + + + + + + + + + + -
void dmxeqSwitchScreen ( ScreenPtr  pScreen, void dmxCoreMotion (DevicePtr  pDev,
int  x,
Bool  fromDIXint  y,
) int  delta,
DMXBlockType  block 
)
-
- - - - - -
-   - - -

-Make pScreen the new screen for enqueueing events. If fromDIX is TRUE, also make pScreen the new screen for dequeuing events.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::binding, _DMXInputInfo::detached, _DMXInputInfo::devs, DMXDBG4, DMXDBG5, DMXDBG6, dmxFindFirstScreen(), dmxGlobalHeight, dmxGlobalInvalid, dmxGlobalWidth, dmxGlobalX, dmxGlobalY, dmxInputs, dmxNumInputs, dmxScreens, dmxSigioBlock(), dmxSigioUnblock(), enqueueMotion(), _DMXScreenInfo::index, _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, ProcessInputEvents(), _DMXScreenInfo::rootXOrigin, _DMXScreenInfo::rootYOrigin, _DMXLocalInputInfo::sendsCore, and _DMXLocalInputInfo::update_position.

+ +

Referenced by dmxMotion(), and dmxSetCursor().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + - - + + -
void dmxGetGlobalPosition ( int *  x, void dmxeqSwitchScreen (DeviceIntPtr  pDev,
ScreenPtr  pScreen,
int *  yBool  fromDIX 
) )
-
- - - - - -
-   - - -

-Return DMX's notion of the pointer position in the global coordinate space.

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - - - + + + + - -
void dmxInputFree ( DMXInputInfo *  dmxInput  ) DMXScreenInfo* dmxFindFirstScreen (int  x,
-
- - - - - -
-   - - -

-Free all of the memory associated with dmxInput

-

- - - - -
- - - - - - - + + + + + + + + + -
void dmxInputInit ( DMXInputInfo *  dmxInput  ) int  y 
)
-
- - - - - -
-   - - -

-Initialize all of the devices described in dmxInput.

-

- - - - -
- + +
+ +

References dmxNumScreens, dmxOnScreen(), and dmxScreens.

+ +

Referenced by dmxCheckCursor(), and dmxCoreMotion().

+ +
+ + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
void dmxGetGlobalPosition (int *  x,
int *  y 
void dmxInputLateReInit ( DMXInputInfo *  dmxInput  ) )
+ +
+

Return DMX's notion of the pointer position in the global coordinate space.

+ +

References dmxGlobalX, and dmxGlobalY.

+

Referenced by dmxBackendLateReInit(), dmxCheckCursor(), dmxConsoleUpdateFineCursor(), dmxHideCursor(), and dmxSetCursor().

+ +
+ + +
+
+ + + + + + + + +
void dmxInputFree (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Re-initialize all the devices described in dmxInput. Called from #dmxReconfig after the cursor is redisplayed.

-

- - - - -
- + +
+

Free all of the memory associated with dmxInput

+ +

References _DMXInputInfo::devs, dmxInputFreeLocal(), _DMXInputInfo::freename, _DMXInputInfo::geometry, _DMXInputInfo::keycodes, _DMXInputInfo::name, _DMXInputInfo::numDevs, and _DMXInputInfo::symbols.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInputLogDevices ( void   ) void dmxInputInit (DMXInputInfo *  dmxInput ) 
+ +
+

Initialize all of the devices described in dmxInput.

+ +

References _DMXInputInfo::console, _DMXInputInfo::core, _DMXInputInfo::detached, _DMXInputInfo::devs, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxAddDevice(), dmxArgC(), dmxArgFree(), dmxArgParse(), dmxArgV(), dmxBlockHandler(), dmxFatal, dmxInputCopyLocal(), dmxInputScanForExtensions(), dmxLog(), dmxLogInput(), dmxNumScreens, dmxPopulateLocal(), dmxProcessInputEvents(), dmxPropertySameDisplay(), dmxScreens, dmxUpdateWindowInformation(), dmxWakeupHandler(), dmxWarning, _DMXInputInfo::geometry, _DMXInputInfo::inputIdx, _DMXLocalInputInfo::isCore, _DMXInputInfo::keycodes, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, _DMXInputInfo::processInputEvents, _DMXInputInfo::scrnIdx, _DMXInputInfo::symbols, _DMXLocalInputInfo::type, _DMXInputInfo::updateWindowInfo, and _DMXInputInfo::windows.

+ +

Referenced by dmxInputAttachNew(), and InitInput().

+
+ + +
+
+ + + + + + + + +
void dmxInputLateReInit (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Log information about all of the known devices using dmxLog().

-

- - - - -
- + +
+

Re-initialize all the devices described in dmxInput. Called from dmxAdjustCursorBoundaries after the cursor is redisplayed.

+ +

References _DMXInputInfo::devs, _DMXLocalInputInfo::latereinit, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxAdjustCursorBoundaries().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInputReInit ( DMXInputInfo *  dmxInput  ) void dmxInputLogDevices (void  ) 
+ +
+

Log information about all of the known devices using dmxLog().

+ +

References _DMXInputInfo::detached, _DMXLocalInputInfo::deviceId, _DMXLocalInputInfo::deviceName, _DMXInputInfo::devs, dmxGetInputCount(), dmxInfo, dmxInputs, dmxLog(), dmxLogCont(), dmxNumInputs, _DMXInputInfo::inputIdx, _DMXLocalInputInfo::isCore, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxConnectionBlockCallback(), dmxInputAttachNew(), dmxInputAttachOld(), and dmxInputDetach().

+
+ + +
+
+ + + + + + + + +
void dmxInputReInit (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Re-initialize all the devices described in dmxInput. Called from #dmxReconfig before the cursor is redisplayed.

-

- - - - -
- + +
+

Re-initialize all the devices described in dmxInput. Called from dmxAdjustCursorBoundaries before the cursor is redisplayed.

+ +

References _DMXInputInfo::devs, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::reinit.

+ +

Referenced by dmxAdjustCursorBoundaries().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxUpdateWindowInfo ( DMXUpdateType  type, void dmxUpdateWindowInfo (DMXUpdateType  type,
WindowPtr  pWindowWindowPtr  pWindow 
) )
-
- - - - - -
-   - - -

-This routine is called from #dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.

-

Variable Documentation

-

- - - + + + +
+
+
- - - - -
DMXInputInfo* dmxInputs + +
+

This routine is called from dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.

+ +

References _DMXInputInfo::detached, dmxInputs, dmxNumInputs, and _DMXInputInfo::updateWindowInfo.

+ +

Referenced by dmxCopyWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), and dmxUnrealizeWindow().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
DMXInputInfo* dmxInputs
-
- - - - - -
-   - - -

-List of inputs

-

- - - - -
- + +
+

List of inputs

+ +

Referenced by dmxAddDevice(), dmxAdjustCursorBoundaries(), dmxBackendInitPrivate(), dmxBlockHandler(), dmxChangePointerControl(), dmxCheckFunctionKeys(), dmxCommonCopyPrivate(), dmxConfigAddInput(), dmxConsoleInit(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxGetInputCount(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputDetach(), dmxInputDetachAll(), dmxInputLocateId(), dmxInputLogDevices(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxSigioDisableInput(), dmxSigioEnableInput(), dmxSigioHandler(), dmxTranslateAndEnqueueExtEvent(), dmxUpdateWindowInfo(), dmxWakeupHandler(), InitInput(), and ProcessInputEvents().

+ +
+ + +
+
+
- +
int dmxNumInputs + int dmxNumInputs
-
- - - - - -
-   - - -

-Number of dmxInputs

+ +

+

Number of dmxInputs

+ +

Referenced by dmxAdjustCursorBoundaries(), dmxChangePointerControl(), dmxConfigAddInput(), dmxConfigConfigInputs(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxGetInputCount(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputDetach(), dmxInputDetachAll(), dmxInputLocateId(), dmxInputLogDevices(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxSigioDisableInput(), dmxSigioEnableInput(), dmxSigioHandler(), dmxUpdateWindowInfo(), InitInput(), InitOutput(), and ProcessInputEvents().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html new file mode 100644 index 000000000..931bb12cb --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html @@ -0,0 +1,157 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html index 9b06c5221..d2e4953ea 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html @@ -6,463 +6,1449 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinputinit.c File Reference

#include "dmxinputinit.h"
-#include "dmxextension.h"
-#include "dmxdummy.h"
-#include "dmxbackend.h"
-#include "dmxconsole.h"
-#include "dmxcommon.h"
-#include "dmxevents.h"
-#include "dmxmotion.h"
-#include "dmxeq.h"
-#include "dmxprop.h"
-#include "config/dmxconfig.h"
-#include "dmxcursor.h"
-#include "lnx-keyboard.h"
-#include "lnx-ms.h"
-#include "lnx-ps2.h"
-#include "usb-keyboard.h"
-#include "usb-mouse.h"
-#include "usb-other.h"
-#include "usb-common.h"
-#include "dmxsigio.h"
-#include "dmxarg.h"
-#include "inputstr.h"
-#include "input.h"
-#include "mipointer.h"
-#include "windowstr.h"
-#include "XI.h"
-#include "XIproto.h"
-#include "exevents.h"
-#include "extinit.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxinputinit.c File Reference

#include "dmxinputinit.h"
+#include "dmxextension.h"
+#include "dmxdummy.h"
+#include "dmxbackend.h"
+#include "dmxconsole.h"
+#include "dmxcommon.h"
+#include "dmxevents.h"
+#include "dmxmotion.h"
+#include "dmxprop.h"
+#include "config/dmxconfig.h"
+#include "dmxcursor.h"
+#include "lnx-keyboard.h"
+#include "lnx-ms.h"
+#include "lnx-ps2.h"
+#include "usb-keyboard.h"
+#include "usb-mouse.h"
+#include "usb-other.h"
+#include "usb-common.h"
+#include "dmxsigio.h"
+#include "dmxarg.h"
+#include "inputstr.h"
+#include "input.h"
+#include "mipointer.h"
+#include "windowstr.h"
+#include "mi.h"
+#include "xkbsrv.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+#include "extinit.h"
+

Functions

void dmxChangePointerControl (DeviceIntPtr pDevice, PtrCtrl *ctrl)
void dmxKeyboardKbdCtrlProc (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
void dmxKeyboardBellProc (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)
DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s)
void dmxInputReInit (DMXInputInfo *dmxInput)
void dmxInputLateReInit (DMXInputInfo *dmxInput)
void dmxInputInit (DMXInputInfo *dmxInput)
void dmxInputFree (DMXInputInfo *dmxInput)
void dmxInputLogDevices (void)
int dmxInputDetach (DMXInputInfo *dmxInput)
void dmxInputDetachAll (DMXScreenInfo *dmxScreen)
int dmxInputDetachId (int id)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define DMX_WINDOW_DEBUG   0
#define LEN   32

Functions

void DDXRingBell (int volume, int pitch, int duration)
static void dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
static void dmxBell (int volume, DeviceIntPtr pDev, pointer arg, int something)
static void _dmxChangePointerControl (DMXLocalInputInfoPtr dmxLocal, PtrCtrl *ctrl)
void dmxChangePointerControl (DeviceIntPtr pDevice, PtrCtrl *ctrl)
static void _dmxKeyboardKbdCtrlProc (DMXLocalInputInfoPtr dmxLocal, KeybdCtrl *ctrl)
void dmxKeyboardKbdCtrlProc (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
static void _dmxKeyboardBellProc (DMXLocalInputInfoPtr dmxLocal, int percent)
void dmxKeyboardBellProc (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)
static void dmxKeyboardFreeNames (XkbComponentNamesPtr names)
static int dmxKeyboardOn (DeviceIntPtr pDevice, DMXLocalInitInfo *info)
static int dmxDeviceOnOff (DeviceIntPtr pDevice, int what)
static void dmxProcessInputEvents (DMXInputInfo *dmxInput)
static void dmxUpdateWindowInformation (DMXInputInfo *dmxInput, DMXUpdateType type, WindowPtr pWindow)
static void dmxCollectAll (DMXInputInfo *dmxInput)
static void dmxBlockHandler (pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
static void dmxSwitchReturn (pointer p)
static void dmxWakeupHandler (pointer blockData, int result, pointer pReadMask)
static char * dmxMakeUniqueDeviceName (DMXLocalInputInfoPtr dmxLocal)
static DeviceIntPtr dmxAddDevice (DMXLocalInputInfoPtr dmxLocal)
static DMXLocalInputInfoPtr dmxLookupLocal (const char *name)
DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s)
static void dmxPopulateLocal (DMXInputInfo *dmxInput, dmxArg a)
int dmxInputExtensionErrorHandler (Display *dsp, char *name, char *reason)
static void dmxInputScanForExtensions (DMXInputInfo *dmxInput, int doXI)
void dmxInputReInit (DMXInputInfo *dmxInput)
void dmxInputLateReInit (DMXInputInfo *dmxInput)
void dmxInputInit (DMXInputInfo *dmxInput)
static void dmxInputFreeLocal (DMXLocalInputInfoRec *local)
void dmxInputFree (DMXInputInfo *dmxInput)
void dmxInputLogDevices (void)
int dmxInputDetach (DMXInputInfo *dmxInput)
void dmxInputDetachAll (DMXScreenInfo *dmxScreen)
int dmxInputDetachId (int id)
DMXInputInfo * dmxInputLocateId (int id)
static int dmxInputAttachNew (DMXInputInfo *dmxInput, int *id)
static int dmxInputAttachOld (DMXInputInfo *dmxInput, int *id)
int dmxInputAttachConsole (const char *name, int isCore, int *id)
int dmxInputAttachBackend (int physicalScreen, int isCore, int *id)

Variables

DMXLocalInputInfoPtr dmxLocalCorePointer
DMXLocalInputInfoPtr dmxLocalCoreKeyboard
static DMXLocalInputInfoRec DMXDummyMou
static DMXLocalInputInfoRec DMXDummyKbd
static DMXLocalInputInfoRec DMXBackendMou
static DMXLocalInputInfoRec DMXBackendKbd
static DMXLocalInputInfoRec DMXConsoleMou
static DMXLocalInputInfoRec DMXConsoleKbd
static DMXLocalInputInfoRec DMXCommonOth
static DMXLocalInputInfoRec DMXLocalDevices []
-

Detailed Description

-This file provides generic input support. Functions here set up input and lead to the calling of low-level device drivers for input.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides generic input support. Functions here set up input and lead to the calling of low-level device drivers for input.

+

Define Documentation

+ +
+
+
- - - - + +
void dmxChangePointerControl ( DeviceIntPtr  pDevice, #define DMX_WINDOW_DEBUG   0
+ +
+ +
+ + +
+
+ + + +
#define LEN   32
+
+
+ +

Referenced by dmxMakeUniqueDeviceName().

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + - - + + + +
static void _dmxChangePointerControl (DMXLocalInputInfoPtr  dmxLocal,
PtrCtrl *  ctrl 
PtrCtrl *  ctrl) [static]
+
+
+ +

References _DMXLocalInputInfo::mCtrl, _DMXLocalInputInfo::mctrl, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxChangePointerControl().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + +
static void _dmxKeyboardBellProc (DMXLocalInputInfoPtr  dmxLocal,
int  percent 
) ) [static]
+
+
+

References _DMXLocalInputInfo::kBell, _DMXLocalInputInfo::kctrl, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxKeyboardBellProc().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static void _dmxKeyboardKbdCtrlProc (DMXLocalInputInfoPtr  dmxLocal,
KeybdCtrl *  ctrl 
) [static]
-
- - - - - -
-   - - -

-Change the pointer control information for the pDevice. If the device sends core events, then also change the control information for all of the pointer devices that send core events.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::kCtrl, _DMXLocalInputInfo::kctrl, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxKeyboardKbdCtrlProc().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + - - + + +
DMXLocalInputInfoPtr dmxInputCopyLocal ( DMXInputInfo *  dmxInput, void DDXRingBell (int  volume,
int  pitch,
DMXLocalInputInfoPtr  sint  duration 
) )
+ +
+
+ + +
+
+ + + + + + + + +
static DeviceIntPtr dmxAddDevice (DMXLocalInputInfoPtr  dmxLocal )  [static]
-
- - - - - -
-   - - -

-Copy the local input information from s into a new devs slot in dmxInput.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::create_private, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxDeviceOnOff(), dmxError, dmxFatal, dmxInputs, dmxLog(), dmxLogInput(), dmxMakeUniqueDeviceName(), _DMXLocalInputInfo::inputIdx, _DMXLocalInputInfo::isCore, _DMXLocalInputInfo::name, _DMXLocalInputInfo::pDevice, _DMXLocalInputInfo::private, _DMXLocalInputInfo::sendsCore, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
int dmxInputDetach ( DMXInputInfo *  dmxInput  ) static void dmxBell (int  volume,
DeviceIntPtr  pDev,
pointer  arg,
int  something 
) [static]
+ +
+ +

Referenced by dmxDeviceOnOff().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static void dmxBlockHandler (pointer  blockData,
OSTimePtr  pTimeout,
pointer  pReadMask 
) [static]
-
- - - - - -
-   - - -

-Detach an input

-

- - - - -
- + +
+ +

References dmxCollectAll(), and dmxInputs.

+ +

Referenced by dmxInputInit().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
void dmxChangePointerControl (DeviceIntPtr  pDevice,
void dmxInputDetachAll ( DMXScreenInfo *  dmxScreen  ) PtrCtrl *  ctrl 
)
+ +
+

Change the pointer control information for the pDevice. If the device sends core events, then also change the control information for all of the pointer devices that send core events.

+ +

References _dmxChangePointerControl(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+ + + + + + + + +
static void dmxCollectAll (DMXInputInfo *  dmxInput )  [static]
-
- - - - - -
-   - - -

-Search for input associated with dmxScreen, and detach.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::binding, _DMXLocalInputInfo::collect_events, _DMXInputInfo::detached, _DMXInputInfo::devs, DMX_BLOCK, dmxCheckSpecialKeys(), dmxEnqueue(), dmxMotion(), _DMXInputInfo::numDevs, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxBlockHandler(), and dmxWakeupHandler().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
static int dmxDeviceOnOff (DeviceIntPtr  pDevice,
int dmxInputDetachId ( int  id  ) int  what 
) [static]
+ +
+

References _DMXLocalInitInfo::belFeedbackClass, _DMXLocalInitInfo::buttonClass, dmxBell(), dmxChangePointerControl(), dmxConfigGetXkbLayout(), dmxConfigGetXkbModel(), dmxConfigGetXkbOptions(), dmxConfigGetXkbRules(), dmxConfigGetXkbVariant(), dmxKbdCtrl(), dmxKeyboardOn(), dmxLog(), dmxPointerGetMotionBufferSize(), dmxSigioRegister(), dmxSigioUnregister(), dmxWarning, _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::freemap, GETDMXINPUTFROMPDEVICE, _DMXLocalInitInfo::intFeedbackClass, _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::ledFeedbackClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numAbsAxes, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::proximityClass, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, _DMXLocalInitInfo::strFeedbackClass, _DMXLocalInitInfo::valuatorClass, and _DMXLocalInitInfo::xkb.

+ +

Referenced by dmxAddDevice().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
int dmxInputAttachBackend (int  physicalScreen,
int  isCore,
int *  id 
)
-
- - - - - -
-   - - -

-Search for input associated with deviceId, and detach.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, _DMXInputInfo::detached, dmxConfigAddInput(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputs, dmxLogInput(), dmxNumInputs, dmxNumScreens, dmxScreens, _DMXScreenInfo::name, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxAddInput().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + +
int dmxInputAttachConsole (const char *  name,
int  isCore,
int *  id 
void dmxInputFree ( DMXInputInfo *  dmxInput  ) )
+ +
+ +

References _DMXInputInfo::detached, dmxConfigAddInput(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputs, dmxLogInput(), dmxNumInputs, _DMXInputInfo::freename, _DMXInputInfo::name, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxAddInput().

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
static int dmxInputAttachNew (DMXInputInfo *  dmxInput,
int *  id 
) [static]
-
- - - - - -
-   - - -

-Free all of the memory associated with dmxInput

-

- - - - -
- + +
+ +

References _DMXInputInfo::devs, dmxInputInit(), dmxInputLogDevices(), and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxInputAttachBackend(), and dmxInputAttachConsole().

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
static int dmxInputAttachOld (DMXInputInfo *  dmxInput,
void dmxInputInit ( DMXInputInfo *  dmxInput  ) int *  id 
) [static]
+ +
+ +

References _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputLogDevices(), dmxLogInput(), _DMXLocalInputInfo::isCore, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+

Referenced by dmxInputAttachBackend(), and dmxInputAttachConsole().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *  dmxInput,
DMXLocalInputInfoPtr  s 
)
-
- - - - - -
-   - - -

-Initialize all of the devices described in dmxInput.

-

- - - - -
- + +
+

Copy the local input information from s into a new devs slot in dmxInput.

+ +

References _DMXInputInfo::core, _DMXLocalInputInfo::deviceId, _DMXInputInfo::devs, dmxFatal, dmxLog(), _DMXInputInfo::inputIdx, _DMXLocalInputInfo::inputIdx, _DMXInputInfo::numDevs, _DMXLocalInputInfo::savedSendsCore, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxInputInit(), dmxInputScanForExtensions(), and dmxPopulateLocal().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInputLateReInit ( DMXInputInfo *  dmxInput  ) int dmxInputDetach (DMXInputInfo *  dmxInput ) 
+ +
+

Detach an input

+ +

References _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputLogDevices(), dmxLogInput(), _DMXLocalInputInfo::isCore, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+
+ + +
+
+ + + + + + + + +
void dmxInputDetachAll (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - - -

-Re-initialize all the devices described in dmxInput. Called from #dmxReconfig after the cursor is redisplayed.

-

- - - - -
- + +
+

Search for input associated with dmxScreen, and detach.

+ +

References dmxInputDetach(), dmxInputs, dmxNumInputs, _DMXScreenInfo::index, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxDetachScreen().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInputLogDevices ( void   ) int dmxInputDetachId (int  id ) 
+ +
+

Search for input associated with deviceId, and detach.

+

References dmxInputDetach(), and dmxInputLocateId().

+ +

Referenced by dmxRemoveInput().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
int dmxInputExtensionErrorHandler (Display *  dsp,
char *  name,
char *  reason 
)
-
- - - - - -
-   - - -

-Log information about all of the known devices using dmxLog().

-

- - - - -
- + +
+ +

Referenced by dmxCommonOthGetInfo(), and dmxInputScanForExtensions().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxInputReInit ( DMXInputInfo *  dmxInput  ) void dmxInputFree (DMXInputInfo *  dmxInput ) 
+ +
+

Free all of the memory associated with dmxInput

+

References _DMXInputInfo::devs, dmxInputFreeLocal(), _DMXInputInfo::freename, _DMXInputInfo::geometry, _DMXInputInfo::keycodes, _DMXInputInfo::name, _DMXInputInfo::numDevs, and _DMXInputInfo::symbols.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+ + + + + + + + +
static void dmxInputFreeLocal (DMXLocalInputInfoRec *  local )  [static]
-
- - - - - -
-   - - -

-Re-initialize all the devices described in dmxInput. Called from #dmxReconfig before the cursor is redisplayed.

-

- - - - -
- + +
+ +

References _DMXLocalInputInfo::destroy_private, _DMXLocalInputInfo::deviceName, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, _DMXLocalInputInfo::history, _DMXLocalInputInfo::isCore, _DMXLocalInputInfo::private, _DMXLocalInputInfo::type, and _DMXLocalInputInfo::valuators.

+ +

Referenced by dmxInputFree().

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxKeyboardBellProc ( int  percent, void dmxInputInit (DMXInputInfo *  dmxInput ) 
+ +
+

Initialize all of the devices described in dmxInput.

+ +

References _DMXInputInfo::console, _DMXInputInfo::core, _DMXInputInfo::detached, _DMXInputInfo::devs, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxAddDevice(), dmxArgC(), dmxArgFree(), dmxArgParse(), dmxArgV(), dmxBlockHandler(), dmxFatal, dmxInputCopyLocal(), dmxInputScanForExtensions(), dmxLog(), dmxLogInput(), dmxNumScreens, dmxPopulateLocal(), dmxProcessInputEvents(), dmxPropertySameDisplay(), dmxScreens, dmxUpdateWindowInformation(), dmxWakeupHandler(), dmxWarning, _DMXInputInfo::geometry, _DMXInputInfo::inputIdx, _DMXLocalInputInfo::isCore, _DMXInputInfo::keycodes, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, _DMXInputInfo::processInputEvents, _DMXInputInfo::scrnIdx, _DMXInputInfo::symbols, _DMXLocalInputInfo::type, _DMXInputInfo::updateWindowInfo, and _DMXInputInfo::windows.

+ +

Referenced by dmxInputAttachNew(), and InitInput().

+ +
+ + +
+
+ + + + + + + +
void dmxInputLateReInit (DMXInputInfo *  dmxInput ) 
+
+
+

Re-initialize all the devices described in dmxInput. Called from dmxAdjustCursorBoundaries after the cursor is redisplayed.

+ +

References _DMXInputInfo::devs, _DMXLocalInputInfo::latereinit, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxAdjustCursorBoundaries().

+ +
+
+ +
+
+ + + + + + + - - +
DMXInputInfo* dmxInputLocateId (int  id )  DeviceIntPtr  pDevice,
+
+
+ +

References _DMXInputInfo::devs, dmxInputs, dmxNumInputs, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxInputDetachId().

+ +
+
+ +
+
+ + + + + + + +
void dmxInputLogDevices (void  ) 
+
+
+

Log information about all of the known devices using dmxLog().

+ +

References _DMXInputInfo::detached, _DMXLocalInputInfo::deviceId, _DMXLocalInputInfo::deviceName, _DMXInputInfo::devs, dmxGetInputCount(), dmxInfo, dmxInputs, dmxLog(), dmxLogCont(), dmxNumInputs, _DMXInputInfo::inputIdx, _DMXLocalInputInfo::isCore, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxConnectionBlockCallback(), dmxInputAttachNew(), dmxInputAttachOld(), and dmxInputDetach().

+ +
+
+ +
+
+ + + + + + + - - + +
void dmxInputReInit (DMXInputInfo *  dmxInput )  pointer  ctrl,
+
+
+

Re-initialize all the devices described in dmxInput. Called from dmxAdjustCursorBoundaries before the cursor is redisplayed.

+ +

References _DMXInputInfo::devs, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::reinit.

+ +

Referenced by dmxAdjustCursorBoundaries().

+ +
+
+ +
+
+ + + + + + + + + + + - - + + + +
static void dmxInputScanForExtensions (DMXInputInfo *  dmxInput,
int  doXI 
int  unknown) [static]
+
+
+ +

References _DMXLocalInputInfo::deviceId, _DMXLocalInputInfo::deviceName, _DMXInputInfo::devs, display, DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxInputCopyLocal(), dmxInputExtensionErrorHandler(), dmxLog(), dmxLogInput(), dmxWarning, _DMXLocalInputInfo::isCore, _DMXInputInfo::name, _DMXInputInfo::numDevs, _DMXLocalInputInfo::sendsCore, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxInputInit().

+ +
+
+ +
+
+ + + + + + + - - + + + + + + + +
static void dmxKbdCtrl (DeviceIntPtr  pDevice,
) KeybdCtrl *  ctrl 
) [static]
+
+
+

Referenced by dmxDeviceOnOff().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void dmxKeyboardBellProc (int  percent,
DeviceIntPtr  pDevice,
pointer  ctrl,
int  unknown 
)
-
- - - - - -
-   - - -

-Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.

-

- - - - -
- + +
+

Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.

+ +

References _dmxKeyboardBellProc(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+
+ + + + + + + + +
static void dmxKeyboardFreeNames (XkbComponentNamesPtr  names )  [static]
+ +
+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+ + + + + + + - - - - + + + + + + + +
void dmxKeyboardKbdCtrlProc (DeviceIntPtr  pDevice,
void dmxKeyboardKbdCtrlProc ( DeviceIntPtr  pDevice, KeybdCtrl *  ctrl 
)
+
+
+

Change the keyboard control information for the pDevice. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.

+ +

References _dmxKeyboardKbdCtrlProc(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxKeyboardOn().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static int dmxKeyboardOn (DeviceIntPtr  pDevice,
KeybdCtrl *  ctrlDMXLocalInitInfo *  info 
) ) [static]
+
+
+ +

References dmxConfigGetXkbLayout(), dmxConfigGetXkbModel(), dmxConfigGetXkbOptions(), dmxConfigGetXkbRules(), dmxConfigGetXkbVariant(), dmxKeyboardBellProc(), dmxKeyboardFreeNames(), dmxKeyboardKbdCtrlProc(), dmxLogInput(), dmxLogInputCont(), _DMXLocalInitInfo::force, _DMXLocalInitInfo::freenames, GETDMXINPUTFROMPDEVICE, and _DMXLocalInitInfo::names.

+ +

Referenced by dmxDeviceOnOff().

+
+
+ +
+
+ + + + + + + + +
static DMXLocalInputInfoPtr dmxLookupLocal (const char *  name )  [static]
-
- - - - - -
-   - - -

-Change the keyboard control information for the pDevice. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.

+ +

+ +

References _DMXLocalInputInfo::name.

+ +

Referenced by dmxPopulateLocal().

+ +
+ + +
+
+ + + + + + + + + +
static char* dmxMakeUniqueDeviceName (DMXLocalInputInfoPtr  dmxLocal )  [static]
+
+
+ +

References DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxGeneration, LEN, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxAddDevice().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
static void dmxPopulateLocal (DMXInputInfo *  dmxInput,
dmxArg  a 
) [static]
+
+
+ +

References DMX_LOCAL_KEYBOARD, DMX_LOCAL_MOUSE, dmxArgC(), dmxArgV(), dmxFatal, dmxInfo, dmxInputCopyLocal(), dmxLog(), dmxLookupLocal(), dmxWarning, _DMXLocalInputInfo::name, and _DMXLocalInputInfo::type.

+ +

Referenced by dmxInputInit().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxProcessInputEvents (DMXInputInfo *  dmxInput )  [static]
+
+
+ +

References _DMXLocalInputInfo::binding, _DMXInputInfo::detached, _DMXInputInfo::devs, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::process_input.

+ +

Referenced by dmxInputInit().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxSwitchReturn (pointer  p )  [static]
+
+
+ +

References _DMXInputInfo::devs, dmxFatal, dmxInfo, dmxLog(), dmxSigioEnableInput(), _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, _DMXLocalInputInfo::vt_post_switch, and _DMXInputInfo::vt_switched.

+ +

Referenced by dmxWakeupHandler().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxUpdateWindowInformation (DMXInputInfo *  dmxInput,
DMXUpdateType  type,
WindowPtr  pWindow 
) [static]
+
+
+ +

References _DMXLocalInputInfo::binding, _DMXInputInfo::detached, _DMXInputInfo::devs, DMX_UPDATE_COPY, DMX_UPDATE_REALIZE, DMX_UPDATE_REPARENT, DMX_UPDATE_RESIZE, DMX_UPDATE_RESTACK, DMX_UPDATE_UNREALIZE, dmxDebug, dmxLog(), _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, and _DMXLocalInputInfo::update_info.

+ +

Referenced by dmxInputInit().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxWakeupHandler (pointer  blockData,
int  result,
pointer  pReadMask 
) [static]
+
+
+ +

References _DMXInputInfo::devs, dmxCollectAll(), dmxInfo, dmxInputs, dmxLog(), dmxSigioDisableInput(), dmxSwitchReturn(), _DMXInputInfo::numDevs, _DMXLocalInputInfo::private, _DMXLocalInputInfo::vt_pre_switch, _DMXLocalInputInfo::vt_switch, _DMXInputInfo::vt_switch_pending, and _DMXInputInfo::vt_switched.

+ +

Referenced by dmxInputInit().

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
DMXLocalInputInfoRec DMXBackendKbd [static]
+
+
+Initial value:
 {
+    "backend-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_BACKEND,
+    1, 
+    dmxCommonCopyPrivate, NULL,
+    dmxBackendInit, NULL, NULL, dmxBackendKbdGetInfo,
+    dmxCommonKbdOn, dmxCommonKbdOff, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXBackendMou [static]
+
+
+Initial value:
 {
+    "backend-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_BACKEND, 2,
+    dmxBackendCreatePrivate, dmxBackendDestroyPrivate,
+    dmxBackendInit, NULL, dmxBackendLateReInit, dmxBackendMouGetInfo,
+    dmxCommonMouOn, dmxCommonMouOff, dmxBackendUpdatePosition,
+    NULL, NULL, NULL,
+    dmxBackendCollectEvents, dmxBackendProcessInput, dmxBackendFunctions, NULL,
+    dmxCommonMouCtrl
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXCommonOth [static]
+
+
+Initial value:
 {
+    "common-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_COMMON, 1,
+    dmxCommonCopyPrivate, NULL,
+    NULL, NULL, NULL, dmxCommonOthGetInfo,
+    dmxCommonOthOn, dmxCommonOthOff
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXConsoleKbd [static]
+
+
+Initial value:
 {
+    "console-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_CONSOLE,
+    1, 
+    dmxCommonCopyPrivate, NULL,
+    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleKbdGetInfo,
+    dmxCommonKbdOn, dmxCommonKbdOff, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXConsoleMou [static]
+
+
+Initial value:
 {
+    "console-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, 2,
+    dmxConsoleCreatePrivate, dmxConsoleDestroyPrivate,
+    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleMouGetInfo,
+    dmxCommonMouOn, dmxCommonMouOff, dmxConsoleUpdatePosition,
+    NULL, NULL, NULL,
+    dmxConsoleCollectEvents, NULL, dmxConsoleFunctions, dmxConsoleUpdateInfo,
+    dmxCommonMouCtrl
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXDummyKbd [static]
+
+
+Initial value:
 {
+    "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+    NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXDummyMou [static]
+
+
+Initial value:
 {
+    "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+    NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo
+}
+
+
+
+ +
+
+ + + + +
DMXLocalInputInfoPtr dmxLocalCoreKeyboard
+
+
+ +

Referenced by dmxCheckFunctionKeys(), dmxCheckSpecialKeys(), dmxEnqueue(), dmxFixup(), and dmxKeySymToKeyCode().

+ +
+
+ +
+
+ + + + +
DMXLocalInputInfoPtr dmxLocalCorePointer
+
+
+ +

Referenced by ChangeKeyboardDevice(), and ChangePointerDevice().

+ +
+
+ +
+
+ + + + +
DMXLocalInputInfoRec DMXLocalDevices[] [static]
+
+
+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html deleted file mode 100644 index 9899c67a0..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html +++ /dev/null @@ -1,259 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinputinit.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXINPUTINIT_H_
-00039 #define _DMXINPUTINIT_H_
-00040 
-00041 #include "dmx.h"
-00042 #include "dmxinput.h"
-00043 #include "dmxlog.h"
-00044 
-00045 
-00046 #define DMX_LOCAL_DEFAULT_KEYBOARD "kbd"
-00047 #define DMX_LOCAL_DEFAULT_POINTER  "ps2"
-00048 #define DMX_MAX_BUTTONS            256
-00049 #define DMX_MOTION_SIZE            256
-00050 #define DMX_MAX_VALUATORS          32
-00051 #define DMX_MAX_AXES               32
-00052 #define DMX_MAX_XINPUT_EVENT_TYPES 100
-00053 #define DMX_MAP_ENTRIES            16 /* Must be a power of 2 */
-00054 #define DMX_MAP_MASK               (DMX_MAP_ENTRIES - 1)
-00055 
-00056 typedef enum {
-00057     DMX_FUNCTION_GRAB,
-00058     DMX_FUNCTION_TERMINATE,
-00059     DMX_FUNCTION_FINE
-00060 } DMXFunctionType;
-00061 
-00062 typedef enum {
-00063     DMX_LOCAL_HIGHLEVEL,
-00064     DMX_LOCAL_KEYBOARD,
-00065     DMX_LOCAL_MOUSE,
-00066     DMX_LOCAL_OTHER
-00067 } DMXLocalInputType;
-00068 
-00069 typedef enum {
-00070     DMX_LOCAL_TYPE_LOCAL,
-00071     DMX_LOCAL_TYPE_CONSOLE,
-00072     DMX_LOCAL_TYPE_BACKEND,
-00073     DMX_LOCAL_TYPE_COMMON
-00074 } DMXLocalInputExtType;
-00075 
-00076 typedef enum {
-00077     DMX_RELATIVE,
-00078     DMX_ABSOLUTE,
-00079     DMX_ABSOLUTE_CONFINED
-00080 } DMXMotionType;
-00081 
-00084 typedef struct _DMXLocalInitInfo {
-00085     int                  keyboard; 
-00087     int                  keyClass; 
-00088     KeySymsRec           keySyms;  
-00089     int                  freemap;  
-00090     CARD8                modMap[MAP_LENGTH]; 
-00091 #ifdef XKB
-00092     XkbDescPtr           xkb;       
-00093     XkbComponentNamesRec names;     
-00094     int                  freenames; 
-00095     int                  force;     
-00096 #endif
-00097 
-00098     int                  buttonClass; 
-00099     int                  numButtons;  
-00100     unsigned char        map[DMX_MAX_BUTTONS]; 
-00102     int                  valuatorClass; 
-00104     int                  numRelAxes;    
-00105     int                  numAbsAxes;    
-00106     int                  minval[DMX_MAX_AXES]; 
-00107     int                  maxval[DMX_MAX_AXES]; 
-00108     int                  res[DMX_MAX_AXES];    
-00109     int                  minres[DMX_MAX_AXES]; 
-00110     int                  maxres[DMX_MAX_AXES]; 
-00112     int                  focusClass;       
-00114     int                  proximityClass;   
-00116     int                  kbdFeedbackClass; 
-00118     int                  ptrFeedbackClass; 
-00120     int                  ledFeedbackClass; 
-00122     int                  belFeedbackClass; 
-00124     int                  intFeedbackClass; 
-00126     int                  strFeedbackClass; 
-00129     int                  maxSymbols;          
-00130     int                  maxSymbolsSupported; 
-00131     KeySym               *symbols;            
-00132 } DMXLocalInitInfo, *DMXLocalInitInfoPtr;
-00133 
-00134 typedef pointer (*dmxCreatePrivateProcPtr)(DeviceIntPtr);
-00135 typedef void    (*dmxDestroyPrivateProcPtr)(pointer);
-00136                 
-00137 typedef void    (*dmxInitProcPtr)(DevicePtr);
-00138 typedef void    (*dmxReInitProcPtr)(DevicePtr);
-00139 typedef void    (*dmxLateReInitProcPtr)(DevicePtr);
-00140 typedef void    (*dmxGetInfoProcPtr)(DevicePtr, DMXLocalInitInfoPtr);
-00141 typedef int     (*dmxOnProcPtr)(DevicePtr);
-00142 typedef void    (*dmxOffProcPtr)(DevicePtr);
-00143 typedef void    (*dmxUpdatePositionProcPtr)(pointer, int x, int y);
-00144                 
-00145 typedef void    (*dmxVTPreSwitchProcPtr)(pointer);  /* Turn I/O Off */
-00146 typedef void    (*dmxVTPostSwitchProcPtr)(pointer); /* Turn I/O On */
-00147 typedef void    (*dmxVTSwitchReturnProcPtr)(pointer);
-00148 typedef int     (*dmxVTSwitchProcPtr)(pointer, int vt,
-00149                                       dmxVTSwitchReturnProcPtr, pointer);
-00150                 
-00151 typedef void    (*dmxMotionProcPtr)(DevicePtr,
-00152                                     int *valuators,
-00153                                     int firstAxis,
-00154                                     int axesCount,
-00155                                     DMXMotionType type,
-00156                                     DMXBlockType block);
-00157 typedef void    (*dmxEnqueueProcPtr)(DevicePtr, int type, int detail,
-00158                                      KeySym keySym, XEvent *e,
-00159                                      DMXBlockType block);
-00160 typedef int     (*dmxCheckSpecialProcPtr)(DevicePtr, KeySym keySym);
-00161 typedef void    (*dmxCollectEventsProcPtr)(DevicePtr,
-00162                                            dmxMotionProcPtr,
-00163                                            dmxEnqueueProcPtr,
-00164                                            dmxCheckSpecialProcPtr,
-00165                                            DMXBlockType);
-00166 typedef void    (*dmxProcessInputProcPtr)(pointer);
-00167 typedef void    (*dmxUpdateInfoProcPtr)(pointer, DMXUpdateType, WindowPtr);
-00168 typedef int     (*dmxFunctionsProcPtr)(pointer, DMXFunctionType);
-00169                 
-00170 typedef void    (*dmxKBCtrlProcPtr)(DevicePtr, KeybdCtrl *ctrl);
-00171 typedef void    (*dmxMCtrlProcPtr)(DevicePtr, PtrCtrl *ctrl);
-00172 typedef void    (*dmxKBBellProcPtr)(DevicePtr, int percent,
-00173                                     int volume, int pitch, int duration);
-00174 
-00177 typedef struct _DMXEventMap {
-00178     int remote;                 
-00179     int server;                 
-00180 } DMXEventMap;
-00181 
-00185 typedef struct _DMXLocalInputInfo {
-00186     const char               *name;   
-00187     DMXLocalInputType        type;    
-00188     DMXLocalInputExtType     extType; 
-00189     int                      binding; 
-00193                                 /* Low-level (e.g., keyboard/mouse drivers) */
-00194 
-00195     dmxCreatePrivateProcPtr  create_private;  
-00198     dmxDestroyPrivateProcPtr destroy_private; 
-00201     dmxInitProcPtr           init;            
-00202     dmxReInitProcPtr         reinit;          
-00205     dmxLateReInitProcPtr     latereinit;      
-00209     dmxGetInfoProcPtr        get_info;        
-00210     dmxOnProcPtr             on;              
-00211     dmxOffProcPtr            off;             
-00212     dmxUpdatePositionProcPtr update_position; 
-00215     dmxVTPreSwitchProcPtr    vt_pre_switch;   
-00216     dmxVTPostSwitchProcPtr   vt_post_switch;  
-00217     dmxVTSwitchProcPtr       vt_switch;       
-00219     dmxCollectEventsProcPtr  collect_events;  
-00222     dmxProcessInputProcPtr   process_input;   
-00224     dmxFunctionsProcPtr      functions;
-00225     dmxUpdateInfoProcPtr     update_info;     
-00228     dmxMCtrlProcPtr          mCtrl;           
-00229     dmxKBCtrlProcPtr         kCtrl;           
-00230     dmxKBBellProcPtr         kBell;           
-00232     pointer                  private;         
-00233     int                      isCore;          
-00234     int                      sendsCore;       
-00235     KeybdCtrl                kctrl;           
-00236     PtrCtrl                  mctrl;           
-00238     DeviceIntPtr             pDevice;         
-00239     int                      inputIdx;        
-00240     int                      lastX, lastY;    
-00244     int                      head;            
-00246     int                      tail;            
-00248     unsigned long            *history;        
-00249     int                      *valuators;      
-00251                                 /* for XInput ChangePointerDevice */
-00252     int                      (*savedMotionProc)(DeviceIntPtr,
-00253                                                 xTimecoord *,
-00254                                                 unsigned long,
-00255                                                 unsigned long,
-00256                                                 ScreenPtr);
-00257     int                      savedMotionEvents; 
-00258     int                      savedSendsCore;    
-00260     DMXEventMap              map[DMX_MAP_ENTRIES]; 
-00261     int                      mapOptimize;          
-00265     long                     deviceId;    
-00267     const char               *deviceName; 
-00269 } DMXLocalInputInfoRec;
-00270 
-00271 extern DMXLocalInputInfoPtr dmxLocalCorePointer, dmxLocalCoreKeyboard;
-00272 
-00273 extern void                 dmxLocalInitInput(DMXInputInfo *dmxInput);
-00274 extern DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo *dmxInput,
-00275                                               DMXLocalInputInfoPtr s);
-00276 
-00277 extern void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl *ctrl);
-00278 extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl);
-00279 extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
-00280                                 pointer ctrl, int unknown);
-00281 
-00282 extern int  dmxInputExtensionErrorHandler(Display *dsp, char *name,
-00283                                           char *reason);
-00284 
-00285 extern int          dmxInputDetach(DMXInputInfo *dmxInput);
-00286 extern void         dmxInputDetachAll(DMXScreenInfo *dmxScreen);
-00287 extern int          dmxInputDetachId(int id);
-00288 extern DMXInputInfo *dmxInputLocateId(int id);
-00289 extern int          dmxInputAttachConsole(const char *name, int isCore,
-00290                                           int *id);
-00291 extern int          dmxInputAttachBackend(int physicalScreen, int isCore,
-00292                                           int *id);
-00293 
-00294 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html index 03a64d73d..fcd892e9d 100644 --- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html @@ -6,392 +6,1082 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxinputinit.h File Reference

#include "dmx.h"
-#include "dmxinput.h"
-#include "dmxlog.h"
+ + +
+

dmxinputinit.h File Reference

#include "dmx.h"
+#include "dmxinput.h"
+#include "dmxlog.h"
-

-Go to the source code of this file. - - - +

Go to the source code of this file.

+

Data Structures

struct  _DMXEventMap
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _DMXLocalInitInfo
struct  _DMXEventMap
struct  _DMXLocalInputInfo

Defines

#define DMX_LOCAL_DEFAULT_KEYBOARD   "kbd"
#define DMX_LOCAL_DEFAULT_POINTER   "ps2"
#define DMX_MAX_BUTTONS   256
#define DMX_MOTION_SIZE   256
#define DMX_MAX_VALUATORS   32
#define DMX_MAX_AXES   32
#define DMX_MAX_XINPUT_EVENT_TYPES   100
#define DMX_MAP_ENTRIES   16
#define DMX_MAP_MASK   (DMX_MAP_ENTRIES - 1)

Typedefs

typedef struct _DMXLocalInitInfo DMXLocalInitInfo
typedef struct _DMXLocalInitInfo * DMXLocalInitInfoPtr
typedef pointer(* dmxCreatePrivateProcPtr )(DeviceIntPtr)
typedef void(* dmxDestroyPrivateProcPtr )(pointer)
typedef void(* dmxInitProcPtr )(DevicePtr)
typedef void(* dmxReInitProcPtr )(DevicePtr)
typedef void(* dmxLateReInitProcPtr )(DevicePtr)
typedef void(* dmxGetInfoProcPtr )(DevicePtr, DMXLocalInitInfoPtr)
typedef int(* dmxOnProcPtr )(DevicePtr)
typedef void(* dmxOffProcPtr )(DevicePtr)
typedef void(* dmxUpdatePositionProcPtr )(pointer, int x, int y)
typedef void(* dmxVTPreSwitchProcPtr )(pointer)
typedef void(* dmxVTPostSwitchProcPtr )(pointer)
typedef void(* dmxVTSwitchReturnProcPtr )(pointer)
typedef int(* dmxVTSwitchProcPtr )(pointer, int vt, dmxVTSwitchReturnProcPtr, pointer)
typedef void(* dmxMotionProcPtr )(DevicePtr, int *valuators, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)
typedef void(* dmxEnqueueProcPtr )(DevicePtr, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
typedef int(* dmxCheckSpecialProcPtr )(DevicePtr, KeySym keySym)
typedef void(* dmxCollectEventsProcPtr )(DevicePtr, dmxMotionProcPtr, dmxEnqueueProcPtr, dmxCheckSpecialProcPtr, DMXBlockType)
typedef void(* dmxProcessInputProcPtr )(pointer)
typedef void(* dmxUpdateInfoProcPtr )(pointer, DMXUpdateType, WindowPtr)
typedef int(* dmxFunctionsProcPtr )(pointer, DMXFunctionType)
typedef void(* dmxKBCtrlProcPtr )(DevicePtr, KeybdCtrl *ctrl)
typedef void(* dmxMCtrlProcPtr )(DevicePtr, PtrCtrl *ctrl)
typedef void(* dmxKBBellProcPtr )(DevicePtr, int percent, int volume, int pitch, int duration)
typedef struct _DMXEventMap DMXEventMap
typedef struct _DMXLocalInputInfo DMXLocalInputInfoRec

Enumerations

enum  DMXFunctionType { DMX_FUNCTION_GRAB, +DMX_FUNCTION_TERMINATE, +DMX_FUNCTION_FINE + }
enum  DMXLocalInputType { DMX_LOCAL_HIGHLEVEL, +DMX_LOCAL_KEYBOARD, +DMX_LOCAL_MOUSE, +DMX_LOCAL_OTHER + }
enum  DMXLocalInputExtType { DMX_LOCAL_TYPE_LOCAL, +DMX_LOCAL_TYPE_CONSOLE, +DMX_LOCAL_TYPE_BACKEND, +DMX_LOCAL_TYPE_COMMON + }
enum  DMXMotionType { DMX_RELATIVE, +DMX_ABSOLUTE, +DMX_ABSOLUTE_CONFINED + }

Functions

void dmxLocalInitInput (DMXInputInfo *dmxInput)
DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s)
void dmxChangePointerControl (DeviceIntPtr pDevice, PtrCtrl *ctrl)
void dmxKeyboardKbdCtrlProc (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
void dmxKeyboardBellProc (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)
int dmxInputExtensionErrorHandler (Display *dsp, char *name, char *reason)
int dmxInputDetach (DMXInputInfo *dmxInput)
void dmxInputDetachAll (DMXScreenInfo *dmxScreen)
int dmxInputDetachId (int id)
DMXInputInfo * dmxInputLocateId (int id)
int dmxInputAttachConsole (const char *name, int isCore, int *id)
int dmxInputAttachBackend (int physicalScreen, int isCore, int *id)

Variables

DMXLocalInputInfoPtr dmxLocalCorePointer
DMXLocalInputInfoPtr dmxLocalCoreKeyboard
+

Detailed Description

+

Interface for low-level input support.

+
See also:
dmxinputinit.c
+

Define Documentation

+ +
+
+ + + + +
#define DMX_LOCAL_DEFAULT_KEYBOARD   "kbd"
+
+
-
struct  _DMXLocalInitInfo
+ + + +
#define DMX_LOCAL_DEFAULT_POINTER   "ps2"
+ +

-
struct  _DMXLocalInputInfo
+ + + +
#define DMX_MAP_ENTRIES   16
+ +

-

Typedefs

typedef _DMXLocalInitInfo DMXLocalInitInfo
typedef _DMXLocalInitInfo * DMXLocalInitInfoPtr
+ + + +
#define DMX_MAP_MASK   (DMX_MAP_ENTRIES - 1)
+ +

-
typedef _DMXEventMap DMXEventMap
typedef _DMXLocalInputInfo DMXLocalInputInfoRec
+ + + +
#define DMX_MAX_AXES   32
+

+
-

Functions

-DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s) +
+ + +
+
+ + + + +
#define DMX_MAX_BUTTONS   256
+
+
-void dmxChangePointerControl (DeviceIntPtr pDevice, PtrCtrl *ctrl) +

Referenced by dmxCommonMouGetMap().

-void dmxKeyboardKbdCtrlProc (DeviceIntPtr pDevice, KeybdCtrl *ctrl) +
+
+ +
+
+ + + + +
#define DMX_MAX_VALUATORS   32
+
+
-void dmxKeyboardBellProc (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown) +
+
+ +
+
+ + + + +
#define DMX_MAX_XINPUT_EVENT_TYPES   100
+
+
-int dmxInputDetach (DMXInputInfo *dmxInput) +

Referenced by dmxCommonOthOn().

-void dmxInputDetachAll (DMXScreenInfo *dmxScreen) +
+
+ +
+
+ + + + +
#define DMX_MOTION_SIZE   256
+
+
-int dmxInputDetachId (int id) +

Referenced by dmxPointerGetMotionBufferSize(), dmxPointerGetMotionEvents(), and dmxPointerPutMotionEvent().

- -

Detailed Description

-Interface for low-level input support.
See also:
dmxinputinit.c
-

Typedef Documentation

-

- - - - -
- - -
typedef struct _DMXEventMap DMXEventMap -
-
- - - - - -
-   - - -

-Stores a mapping between the device id on the remote X server and the id on the DMX server

-

- - - - -
- + + +

Typedef Documentation

+ +
+
+
+ + + +
typedef int(* dmxCheckSpecialProcPtr)(DevicePtr, KeySym keySym)
+ +
+ +
+ + +
+
+ - +
typedef struct _DMXLocalInitInfo DMXLocalInitInfo + typedef void(* dmxCollectEventsProcPtr)(DevicePtr, dmxMotionProcPtr, dmxEnqueueProcPtr, dmxCheckSpecialProcPtr, DMXBlockType)
-
- - - - - -
-   - - -

-Stores information from low-level device that is used to initialize the device at the dix level.

-

- - - - + +
+ +
+ + +
+
+
- + +
+ +
+ + +
+
+
+ + + +
typedef pointer(* dmxCreatePrivateProcPtr)(DeviceIntPtr)
+ +
+ +
+ + +
+
+ + + + +
typedef void(* dmxDestroyPrivateProcPtr)(pointer)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxEnqueueProcPtr)(DevicePtr, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXEventMap DMXEventMap
+
+
+

Stores a mapping between the device id on the remote X server and the id on the DMX server

+ +
+
+ +
+
+ + + + +
typedef int(* dmxFunctionsProcPtr)(pointer, DMXFunctionType)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxGetInfoProcPtr)(DevicePtr, DMXLocalInitInfoPtr)
+
+
+ +
+
+ +
+
+ - +
typedef struct _DMXLocalInitInfo * DMXLocalInitInfoPtr + typedef void(* dmxInitProcPtr)(DevicePtr)
-
+ + + +
typedef void(* dmxKBBellProcPtr)(DevicePtr, int percent, int volume, int pitch, int duration)
+

+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxKBCtrlProcPtr)(DevicePtr, KeybdCtrl *ctrl)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxLateReInitProcPtr)(DevicePtr)
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXLocalInitInfo DMXLocalInitInfo
+
+
+

Stores information from low-level device that is used to initialize the device at the dix level.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXLocalInitInfo * DMXLocalInitInfoPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXLocalInputInfo DMXLocalInputInfoRec
+
+
+

This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c).

+
See also:
dmxinput.h
+
+dmxextensions.c
+ +
+
+ +
+
+ + + + +
typedef void(* dmxMCtrlProcPtr)(DevicePtr, PtrCtrl *ctrl)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxMotionProcPtr)(DevicePtr, int *valuators, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxOffProcPtr)(DevicePtr)
+
+
+ +
+
+ +
+
+ + + + +
typedef int(* dmxOnProcPtr)(DevicePtr)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxProcessInputProcPtr)(pointer)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxReInitProcPtr)(DevicePtr)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxUpdateInfoProcPtr)(pointer, DMXUpdateType, WindowPtr)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxUpdatePositionProcPtr)(pointer, int x, int y)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxVTPostSwitchProcPtr)(pointer)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxVTPreSwitchProcPtr)(pointer)
+
+
+ +
+
+ +
+
+ + + + +
typedef int(* dmxVTSwitchProcPtr)(pointer, int vt, dmxVTSwitchReturnProcPtr, pointer)
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* dmxVTSwitchReturnProcPtr)(pointer)
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum DMXFunctionType
+
+
+
Enumerator:
+ + +
DMX_FUNCTION_GRAB  +
DMX_FUNCTION_TERMINATE  +
DMX_FUNCTION_FINE  +
- - - - - + + + + + + +
+
+
-   - - -

-Stores information from low-level device that is used to initialize the device at the dix level.

+ + + +
enum DMXLocalInputExtType
+
+
+
Enumerator:
+ + + +
DMX_LOCAL_TYPE_LOCAL  +
DMX_LOCAL_TYPE_CONSOLE  +
DMX_LOCAL_TYPE_BACKEND  +
DMX_LOCAL_TYPE_COMMON  +
-

- - - - + +
+
Enumerator:
- + + + + + + +
+
+
- +
typedef struct _DMXLocalInputInfo DMXLocalInputInfoRec + enum DMXLocalInputType
-
+ + + +
DMX_LOCAL_HIGHLEVEL  +
DMX_LOCAL_KEYBOARD  +
DMX_LOCAL_MOUSE  +
DMX_LOCAL_OTHER  +
- - - - - + + + + + + +
+
+
-   - - -

-This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c).

See also:
dmxinput.h

-dmxextensions.c

-
+ + + +
enum DMXMotionType
+

+
+
Enumerator:
+ + +
DMX_RELATIVE  +
DMX_ABSOLUTE  +
DMX_ABSOLUTE_CONFINED  +
-

Function Documentation

-

- - - - -
- + + + + + +

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangePointerControl ( DeviceIntPtr  pDevice, void dmxChangePointerControl (DeviceIntPtr  pDevice,
PtrCtrl *  ctrlPtrCtrl *  ctrl 
) )
-
- - - - - -
-   - - -

-Change the pointer control information for the pDevice. If the device sends core events, then also change the control information for all of the pointer devices that send core events.

-

- - - - -
- + +
+

Change the pointer control information for the pDevice. If the device sends core events, then also change the control information for all of the pointer devices that send core events.

+ +

References _dmxChangePointerControl(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + - - + + -
DMXLocalInputInfoPtr dmxInputCopyLocal ( DMXInputInfo *  dmxInput, int dmxInputAttachBackend (int  physicalScreen,
int  isCore,
DMXLocalInputInfoPtr  sint *  id 
) )
-
- - - - - -
-   - - -

-Copy the local input information from s into a new devs slot in dmxInput.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, _DMXInputInfo::detached, dmxConfigAddInput(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputs, dmxLogInput(), dmxNumInputs, dmxNumScreens, dmxScreens, _DMXScreenInfo::name, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxAddInput().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + -
int dmxInputDetach ( DMXInputInfo *  dmxInput  ) int dmxInputAttachConsole (const char *  name,
int  isCore,
int *  id 
)
-
- - - - - -
-   - - -

-Detach an input

-

- - - - -
- + +
+ +

References _DMXInputInfo::detached, dmxConfigAddInput(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputs, dmxLogInput(), dmxNumInputs, _DMXInputInfo::freename, _DMXInputInfo::name, and _DMXInputInfo::scrnIdx.

+ +

Referenced by dmxAddInput().

+ +
+ + +
+
+
- - - - - - + + + + + + + + + + + + + + + +
void dmxInputDetachAll ( DMXScreenInfo *  dmxScreen  ) DMXLocalInputInfoPtr dmxInputCopyLocal (DMXInputInfo *  dmxInput,
DMXLocalInputInfoPtr  s 
)
+ +
+

Copy the local input information from s into a new devs slot in dmxInput.

+

References _DMXInputInfo::core, _DMXLocalInputInfo::deviceId, _DMXInputInfo::devs, dmxFatal, dmxLog(), _DMXInputInfo::inputIdx, _DMXLocalInputInfo::inputIdx, _DMXInputInfo::numDevs, _DMXLocalInputInfo::savedSendsCore, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxInputInit(), dmxInputScanForExtensions(), and dmxPopulateLocal().

+ +
+ + +
+
+ + + + + + + + +
int dmxInputDetach (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Search for input associated with dmxScreen, and detach.

-

- - - - -
- + +
+

Detach an input

+ +

References _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputLogDevices(), dmxLogInput(), _DMXLocalInputInfo::isCore, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXLocalInputInfo::sendsCore.

+ +
+ + +
+
+
- - - - - - + + + + + + +
int dmxInputDetachId ( int  id  ) void dmxInputDetachAll (DMXScreenInfo *  dmxScreen ) 
+ +
+

Search for input associated with dmxScreen, and detach.

+ +

References dmxInputDetach(), dmxInputs, dmxNumInputs, _DMXScreenInfo::index, and _DMXInputInfo::scrnIdx.

+

Referenced by dmxDetachScreen().

+ +
+ + +
+
+ + + + + + + + +
int dmxInputDetachId (int  id ) 
-
- - - - - -
-   - - -

-Search for input associated with deviceId, and detach.

-

- - - - -
- + +
+

Search for input associated with deviceId, and detach.

+ +

References dmxInputDetach(), and dmxInputLocateId().

+ +

Referenced by dmxRemoveInput().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + + + +
void dmxKeyboardBellProc ( int  percent, int dmxInputExtensionErrorHandler (Display *  dsp,
char *  name,
DeviceIntPtr  pDevice, char *  reason 
)
+ +
+ +

Referenced by dmxCommonOthGetInfo(), and dmxInputScanForExtensions().

+ +
+ + +
+
+ + + + + + + - - +
DMXInputInfo* dmxInputLocateId (int  id )  pointer  ctrl,
+
+
+ +

References _DMXInputInfo::devs, dmxInputs, dmxNumInputs, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::pDevice.

+ +

Referenced by dmxInputDetachId().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + - - + + - - + + -
void dmxKeyboardBellProc (int  percent,
DeviceIntPtr  pDevice,
pointer  ctrl,
int  unknownint  unknown 
) )
-
- - - - - -
-   - - -

-Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.

-

- - - - -
- + +
+

Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.

+ +

References _dmxKeyboardBellProc(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
void dmxKeyboardKbdCtrlProc ( DeviceIntPtr  pDevice, void dmxKeyboardKbdCtrlProc (DeviceIntPtr  pDevice,
KeybdCtrl *  ctrl 
KeybdCtrl *  ctrl)
+ +
+

Change the keyboard control information for the pDevice. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.

+ +

References _dmxKeyboardKbdCtrlProc(), _DMXInputInfo::detached, _DMXInputInfo::devs, dmxInputs, dmxNumInputs, GETDMXLOCALFROMPDEVICE, _DMXInputInfo::numDevs, and _DMXLocalInputInfo::sendsCore.

+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+ + + + + + - - +
void dmxLocalInitInput (DMXInputInfo *  dmxInput )  ) 
+
+
+
+
+

Variable Documentation

+ +
+
+ + + +
DMXLocalInputInfoPtr dmxLocalCoreKeyboard
-
- - - - - -
-   - - -

-Change the keyboard control information for the pDevice. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.

+

+
+ +

Referenced by dmxCheckFunctionKeys(), dmxCheckSpecialKeys(), dmxEnqueue(), dmxFixup(), and dmxKeySymToKeyCode().

+ +
+
+ +
+
+ + + + +
DMXLocalInputInfoPtr dmxLocalCorePointer
+
+
+ +

Referenced by ChangeKeyboardDevice(), and ChangePointerDevice().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html new file mode 100644 index 000000000..c7f7c1319 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html @@ -0,0 +1,269 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8c.html b/xorg-server/hw/dmx/doc/html/dmxlog_8c.html index c32a4f9c9..b9c072bfb 100644 --- a/xorg-server/hw/dmx/doc/html/dmxlog_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxlog_8c.html @@ -6,588 +6,618 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxlog.c File Reference

#include "dmx.h"
-#include "dmxlog.h"
-#include "dmxinput.h"
-#include "XI.h"
-#include "XIproto.h"
- - - - - - - - - - - - - - + + +
+

dmxlog.c File Reference

#include "dmx.h"
+#include "dmxlog.h"
+#include "dmxinput.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+

Functions

dmxLogLevel dmxSetLogLevel (dmxLogLevel newLevel)
dmxLogLevel dmxGetLogLevel (void)
void AbortServer (void)
void dmxLog (dmxLogLevel logLevel, const char *format,...)
void dmxLogCont (dmxLogLevel logLevel, const char *format,...)
void dmxLogOutput (DMXScreenInfo *dmxScreen, const char *format,...)
+ + + + + + + + + + + + + + + + + + + + +

Functions

dmxLogLevel dmxSetLogLevel (dmxLogLevel newLevel)
dmxLogLevel dmxGetLogLevel (void)
void AbortServer (void)
static void VFatalError (const char *format, va_list args)
static void dmxHeader (dmxLogLevel logLevel, DMXInputInfo *dmxInput, DMXScreenInfo *dmxScreen)
static void dmxMessage (dmxLogLevel logLevel, const char *format, va_list args)
void dmxLog (dmxLogLevel logLevel, const char *format,...)
void dmxLogCont (dmxLogLevel logLevel, const char *format,...)
void dmxLogOutput (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputCont (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputWarning (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogInput (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogInputCont (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogArgs (dmxLogLevel logLevel, int argc, char **argv)
void dmxLogVisual (DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
const char * dmxXInputEventName (int type)
const char * dmxEventName (int type)

Variables

static dmxLogLevel dmxCurrentLogLevel = dmxDebug
+

Detailed Description

+

This file encapsulated all of the logging functions that are used by DMX for informational, warning, and error messages.

+

Function Documentation

+ +
+
+ + + + + + + + + +
void AbortServer (void  ) 
+
+
+

This function was removed between XFree86 4.3.0 and XFree86 4.4.0.

-void dmxLogOutputCont (DMXScreenInfo *dmxScreen, const char *format,...) +

Referenced by VFatalError().

-void dmxLogOutputWarning (DMXScreenInfo *dmxScreen, const char *format,...) +
+
+ +
+
+ + + + + + + + + +
const char* dmxEventName (int  type ) 
+
+
+

Translate an event type into a human-readable string.

-void dmxLogInput (DMXInputInfo *dmxInput, const char *format,...) +

Referenced by dmxConsoleUpdateFineCursor(), dmxDump(), and dmxEnqueue().

-void dmxLogInputCont (DMXInputInfo *dmxInput, const char *format,...) +
+
+ +
+
+ + + + + + + + + +
dmxLogLevel dmxGetLogLevel (void  ) 
+
+
+

Returns the log level set by dmxLogLevel.

-void dmxLogArgs (dmxLogLevel logLevel, int argc, char **argv) +

References dmxCurrentLogLevel.

-void dmxLogVisual (DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxHeader (dmxLogLevel  logLevel,
DMXInputInfo *  dmxInput,
DMXScreenInfo *  dmxScreen 
) [static]
+
+
-const char * dmxXInputEventName (int type) +

References dmxDebug, dmxError, dmxFatal, dmxInfo, dmxWarning, _DMXScreenInfo::index, _DMXInputInfo::inputIdx, _DMXScreenInfo::name, and _DMXInputInfo::name.

-const char * dmxEventName (int type) +

Referenced by dmxLog(), dmxLogInput(), dmxLogOutput(), and dmxLogOutputWarning().

- -

Detailed Description

-This file encapsulated all of the logging functions that are used by DMX for informational, warning, and error messages.

Function Documentation

-

- - - - -
- - - - - - - - + + + +
+
+
void AbortServer ( void   ) 
+ + + + + - -
void dmxLog (dmxLogLevel  logLevel,
-
- - - - - -
-   - - -

-This function was removed between XFree86 4.3.0 and XFree86 4.4.0.

-

- - - - -
- - - - - - - + + + + - -
const char* dmxEventName ( int  type  ) const char *  format,
-
- - - - - -
-   - - -

-Translate an event type into a human-readable string.

-

- - - - -
- - - - - - - + + + + + + + + + -
dmxLogLevel dmxGetLogLevel ( void   )   ... 
)
-
- - - - - -
-   - - -

-Returns the log level set by dmxLogLevel.

-

- - - - -
- + +
+

Log the specified message at the specified logLevel. format can be a printf-like format expression.

+ +

References dmxHeader(), and dmxMessage().

+ +

Referenced by ddxProcessArgument(), dmxAddDevice(), dmxAttachScreen(), dmxBackendCollectEvents(), dmxBackendInitPrivate(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBESavePixmap(), dmxCheckFunctionKeys(), dmxCheckSpecialKeys(), dmxCommonOthOn(), dmxCommonRestoreState(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigAddInput(), dmxConfigConfigure(), dmxConfigCopyData(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConfigFromConfigFile(), dmxConfigReadFile(), dmxConfigStoreConfig(), dmxConfigStoreDisplay(), dmxConfigStoreFile(), dmxConfigStoreInput(), dmxConfigStoreXInput(), dmxConfigWriteFile(), dmxConnectionBlockCallback(), dmxConsoleCreateEmptyCursor(), dmxConsoleDrawWindows(), dmxConsoleFunctions(), dmxConsoleInit(), dmxConsoleUpdateFineCursor(), dmxDetachScreen(), dmxDeviceOnOff(), dmxDisplayInit(), dmxErrorHandler(), dmxFixup(), dmxGetButtonMapping(), dmxGetFontPath(), dmxInitOrigins(), dmxInitOverlap(), dmxInputCopyLocal(), dmxInputInit(), dmxInputLogDevices(), dmxInputScanForExtensions(), dmxLogArgs(), dmxLogVisual(), dmxMapInsert(), dmxOnScreen(), dmxPopulateLocal(), dmxPropertyCheckOtherWindows(), dmxPropertyIterate(), dmxPropertySameDisplay(), dmxPropertyWindow(), dmxReInitOrigins(), dmxSigioRegister(), dmxStatCallback(), dmxSwitchReturn(), dmxSync(), dmxSyncInit(), dmxTranslateAndEnqueueExtEvent(), dmxTryComputeScreenOrigins(), dmxUpdateWindowInformation(), dmxWakeupHandler(), InitInput(), InitOutput(), and othUSBGetInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLog ( dmxLogLevel  logLevel, void dmxLogArgs (dmxLogLevel  logLevel,
const char *  format, int  argc,
... char **  argv 
) )
-
- - - - - -
-   - - -

-Log the specified message at the specified logLevel. format can be a printf-like format expression.

-

- - - - -
- + +
+

Print argc messages, each describing an element in argv. This is maingly for debugging purposes.

+ +

References dmxLog().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogArgs ( dmxLogLevel  logLevel, void dmxLogCont (dmxLogLevel  logLevel,
int  argc, const char *  format,
char **  argv  ... 
) )
-
- - - - - -
-   - - -

-Print argc messages, each describing an element in argv. This is maingly for debugging purposes.

-

- - - - -
- + +
+

Continue a log message without printing the message prefix.

+ +

References dmxMessage().

+ +

Referenced by dmxInputLogDevices(), and dmxStatCallback().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogCont ( dmxLogLevel  logLevel, void dmxLogInput (DMXInputInfo *  dmxInput,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a log message without printing the message prefix.

-

- - - - -
- + +
+

Log an informational message (at level dmxInfo) related to input. The message prefix will contain information from dmxInput.

+ +

References dmxHeader(), dmxInfo, and dmxMessage().

+ +

Referenced by dmxAddDevice(), dmxCommonKbdGetInfo(), dmxCommonRestoreState(), dmxCommonSaveState(), dmxEnqueue(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputAttachOld(), dmxInputDetach(), dmxInputInit(), dmxInputScanForExtensions(), and dmxKeyboardOn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogInput ( DMXInputInfo *  dmxInput, void dmxLogInputCont (DMXInputInfo *  dmxInput,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log an informational message (at level dmxInfo) related to input. The message prefix will contain information from dmxInput.

-

- - - - -
- + +
+

Continue a message related to input without printing the message prefix.

+ +

References dmxInfo, and dmxMessage().

+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogInputCont ( DMXInputInfo *  dmxInput, void dmxLogOutput (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a message related to input without printing the message prefix.

-

- - - - -
- + +
+

Log an informational message (at level dmxInfo) related to ouput. The message prefix will contain backend information from dmxScreen.

+ +

References dmxHeader(), dmxInfo, and dmxMessage().

+ +

Referenced by _dmxDPMSInit(), dmxAttachScreen(), dmxDetachScreen(), dmxGetScreenAttribs(), dmxInitOrigins(), dmxInitOverlap(), dmxLogVisual(), dmxPrintScreenInfo(), dmxPropertyCheckOtherServers(), and dmxReInitOrigins().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutput ( DMXScreenInfo *  dmxScreen, void dmxLogOutputCont (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log an informational message (at level dmxInfo) related to ouput. The message prefix will contain backend information from dmxScreen.

-

- - - - -
- + +
+

Continue a message related to output without printing the message prefix.

+ +

References dmxInfo, and dmxMessage().

+ +

Referenced by dmxInitOverlap(), dmxPrintOverlap(), and dmxPrintScreenInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutputCont ( DMXScreenInfo *  dmxScreen, void dmxLogOutputWarning (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a message related to output without printing the message prefix.

-

- - - - -
- + +
+

Log a warning message (at level dmxWarning) related to output. The message prefix will contain backend information from dmxScreen.

+ +

References dmxHeader(), dmxMessage(), and dmxWarning.

+ +

Referenced by dmxGetScreenAttribs(), dmxPrintScreenInfo(), and dmxPropertyCheckOtherServers().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutputWarning ( DMXScreenInfo *  dmxScreen, void dmxLogVisual (DMXScreenInfo *  dmxScreen,
const char *  format, XVisualInfo *  vi,
... int  defaultVisual 
) )
-
- - - - - -
-   - - -

-Log a warning message (at level dmxWarning) related to output. The message prefix will contain backend information from dmxScreen.

-

- - - - -
- + +
+

Print messages at level dmxInfo describing the visuals in vi.

+ +

References dmxInfo, dmxLog(), and dmxLogOutput().

+ +

Referenced by dmxConnectionBlockCallback(), and dmxGetVisualInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogVisual ( DMXScreenInfo *  dmxScreen, static void dmxMessage (dmxLogLevel  logLevel,
XVisualInfo *  vi, const char *  format,
int  defaultVisualva_list  args 
) ) [static]
-
- - - - - -
-   - - -

-Print messages at level dmxInfo describing the visuals in vi.

-

- - - - -
- + +
+ +

References dmxCurrentLogLevel, dmxFatal, and VFatalError().

+ +

Referenced by dmxLog(), dmxLogCont(), dmxLogInput(), dmxLogInputCont(), dmxLogOutput(), dmxLogOutputCont(), and dmxLogOutputWarning().

+ +
+ + +
+
+
- - - - - - + + + + + + +
dmxLogLevel dmxSetLogLevel ( dmxLogLevel  newLevel  ) dmxLogLevel dmxSetLogLevel (dmxLogLevel  newLevel ) 
+ +
+

Set the default level for logging to dmxLogLevel. Returns the previous log level.

+

References dmxCurrentLogLevel, and dmxFatal.

+ +
+ + +
+
+ + + + + + + + +
const char* dmxXInputEventName (int  type ) 
-
- - - - - -
-   - - -

-Set the default level for logging to dmxLogLevel. Returns the previous log level.

-

- - - - -
- + +
+

Translate a (normalized) XInput event type into a human-readable string.

+ +
+ + +
+
+
+ + + + + + - - - - - - + + + + + + + + + +
static void VFatalError (const char *  format,
const char* dmxXInputEventName ( int  type  ) va_list  args 
) [static]
+ +
+ +

References AbortServer(), and OsVendorFatalError().

+ +

Referenced by dmxMessage().

+
+ +

Variable Documentation

+ +
+
+ + + +
dmxLogLevel dmxCurrentLogLevel = dmxDebug [static]
-
- - - - - -
-   - - -

-Translate a (normalized) XInput event type into a human-readable string.

+

+
+ +

Referenced by dmxGetLogLevel(), dmxMessage(), and dmxSetLogLevel().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html deleted file mode 100644 index a345bd809..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxlog.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00039 #ifndef _DMXLOG_H_
-00040 #define _DMXLOG_H_
-00041 
-00043 typedef enum {
-00044     dmxDebug,                   
-00045     dmxInfo,                    
-00046     dmxWarning,                 
-00049     dmxError,                   
-00052     dmxFatal                    
-00054 } dmxLogLevel;
-00055 
-00056 /* Logging functions used by Xserver/hw/dmx routines. */
-00057 extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
-00058 extern dmxLogLevel dmxGetLogLevel(void);
-00059 extern void        dmxLog(dmxLogLevel logLevel, const char *format, ...);
-00060 extern void        dmxLogCont(dmxLogLevel logLevel, const char *format, ...);
-00061 extern const char  *dmxEventName(int type);
-00062 
-00063 #ifndef DMX_LOG_STANDALONE
-00064 extern void dmxLogOutput(DMXScreenInfo *dmxScreen, const char *format, ...);
-00065 extern void dmxLogOutputCont(DMXScreenInfo *dmxScreen, const char *format,
-00066                              ...);
-00067 extern void dmxLogOutputWarning(DMXScreenInfo *dmxScreen, const char *format,
-00068                                 ...);
-00069 extern void dmxLogInput(DMXInputInfo *dmxInput, const char *format, ...);
-00070 extern void dmxLogInputCont(DMXInputInfo *dmxInput, const char *format, ...);
-00071 extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
-00072 extern void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi,
-00073                          int defaultVisual);
-00074 #ifdef XINPUT
-00075 extern const char *dmxXInputEventName(int type);
-00076 #endif
-00077 #endif
-00078 
-00079 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h.html index 6092d1339..09e824217 100644 --- a/xorg-server/hw/dmx/doc/html/dmxlog_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxlog_8h.html @@ -6,602 +6,511 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxlog.h File Reference

-

-Go to the source code of this file. - - - +

References _DMXConfigVirtual::close, _DMXConfigVirtual::dim, dmxConfigAlloc(), _DMXConfigVirtual::height, _DMXConfigVirtual::name, _DMXConfigVirtual::open, _DMXConfigVirtual::start, _DMXConfigString::string, _DMXConfigVirtual::subentry, _DMXConfigVirtual::vname, _DMXConfigVirtual::width, _DMXConfigPair::x, and _DMXConfigPair::y.

- +

Referenced by dmxConfigNCCallback(), and dmxVDLRead().

- + + + +
+
+

Enumerations

enum  dmxLogLevel {
-  dmxDebug, -dmxInfo, -dmxWarning, -dmxError, -
-  dmxFatal -
+

Go to the source code of this file.

+ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +

Enumerations

enum  dmxLogLevel {
+  dmxDebug, +dmxInfo, +dmxWarning, +dmxError, +
+  dmxFatal +
}

Functions

dmxLogLevel dmxSetLogLevel (dmxLogLevel newLevel)
dmxLogLevel dmxGetLogLevel (void)
void dmxLog (dmxLogLevel logLevel, const char *format,...)
void dmxLogCont (dmxLogLevel logLevel, const char *format,...)
const char * dmxEventName (int type)
void dmxLogOutput (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputCont (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputWarning (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogInput (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogInputCont (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogArgs (dmxLogLevel logLevel, int argc, char **argv)
void dmxLogVisual (DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
const char * dmxXInputEventName (int type)

Functions

dmxLogLevel dmxSetLogLevel (dmxLogLevel newLevel)
dmxLogLevel dmxGetLogLevel (void)
void dmxLog (dmxLogLevel logLevel, const char *format,...)
void dmxLogCont (dmxLogLevel logLevel, const char *format,...)
const char * dmxEventName (int type)
void dmxLogOutput (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputCont (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogOutputWarning (DMXScreenInfo *dmxScreen, const char *format,...)
void dmxLogInput (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogInputCont (DMXInputInfo *dmxInput, const char *format,...)
void dmxLogArgs (dmxLogLevel logLevel, int argc, char **argv)
void dmxLogVisual (DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
const char * dmxXInputEventName (int type)
-

Detailed Description

-This header is included by all files that need to use the DMX logging facilities.

Enumeration Type Documentation

-

- - - +

References _DMXConfigToken::comment, dmxConfigAlloc(), _DMXConfigToken::line, and _DMXConfigToken::token.

- + + + +
+
+
- - - - -
enum dmxLogLevel +

Detailed Description

+

This header is included by all files that need to use the DMX logging facilities.

+

Enumeration Type Documentation

+ +
+
+ + + +
enum dmxLogLevel
-
- - - - - -
-   - - -

-Logging levels -- output is tunable with dmxSetLogLevel.

Enumeration values:
- - - - - - + +
+

Logging levels -- output is tunable with dmxSetLogLevel.

+
Enumerator:
dmxDebug  -Usually verbose debugging info
dmxInfo  -Non-warning information
dmxWarning  -A warning that may indicate DMX will not function as the user intends.
dmxError  -A non-fatal error that probably indicates DMX will not function as desired.
dmxFatal  -A fatal error that will cause DMX to shut down.
+ + + + +
dmxDebug  +

Usually verbose debugging info

+
dmxInfo  +

Non-warning information

+
dmxWarning  +

A warning that may indicate DMX will not function as the user intends.

+
dmxError  +

A non-fatal error that probably indicates DMX will not function as desired.

+
dmxFatal  +

A fatal error that will cause DMX to shut down.

+
+
-
-

Function Documentation

-

- - - - -
- + + + +

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
const char* dmxEventName ( int  type  ) const char* dmxEventName (int  type ) 
-
- - - - - -
-   - - -

-Translate an event type into a human-readable string.

-

- - - - -
- + +
+

Translate an event type into a human-readable string.

+ +

Referenced by dmxConsoleUpdateFineCursor(), dmxDump(), and dmxEnqueue().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxLogLevel dmxGetLogLevel ( void   ) dmxLogLevel dmxGetLogLevel (void  ) 
-
- - - - - -
-   - - -

-Returns the log level set by dmxLogLevel.

-

- - - - -
- + +
+

Returns the log level set by dmxLogLevel.

+ +

References dmxCurrentLogLevel.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLog ( dmxLogLevel  logLevel, void dmxLog (dmxLogLevel  logLevel,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log the specified message at the specified logLevel. format can be a printf-like format expression.

-

- - - - -
- + +
+

Log the specified message at the specified logLevel. format can be a printf-like format expression.

+ +

References dmxHeader(), and dmxMessage().

+ +

Referenced by ddxProcessArgument(), dmxAddDevice(), dmxAttachScreen(), dmxBackendCollectEvents(), dmxBackendInitPrivate(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBESavePixmap(), dmxCheckFunctionKeys(), dmxCheckSpecialKeys(), dmxCommonOthOn(), dmxCommonRestoreState(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxConfigAddInput(), dmxConfigConfigure(), dmxConfigCopyData(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxConfigFromConfigFile(), dmxConfigReadFile(), dmxConfigStoreConfig(), dmxConfigStoreDisplay(), dmxConfigStoreFile(), dmxConfigStoreInput(), dmxConfigStoreXInput(), dmxConfigWriteFile(), dmxConnectionBlockCallback(), dmxConsoleCreateEmptyCursor(), dmxConsoleDrawWindows(), dmxConsoleFunctions(), dmxConsoleInit(), dmxConsoleUpdateFineCursor(), dmxDetachScreen(), dmxDeviceOnOff(), dmxDisplayInit(), dmxErrorHandler(), dmxFixup(), dmxGetButtonMapping(), dmxGetFontPath(), dmxInitOrigins(), dmxInitOverlap(), dmxInputCopyLocal(), dmxInputInit(), dmxInputLogDevices(), dmxInputScanForExtensions(), dmxLogArgs(), dmxLogVisual(), dmxMapInsert(), dmxOnScreen(), dmxPopulateLocal(), dmxPropertyCheckOtherWindows(), dmxPropertyIterate(), dmxPropertySameDisplay(), dmxPropertyWindow(), dmxReInitOrigins(), dmxSigioRegister(), dmxStatCallback(), dmxSwitchReturn(), dmxSync(), dmxSyncInit(), dmxTranslateAndEnqueueExtEvent(), dmxTryComputeScreenOrigins(), dmxUpdateWindowInformation(), dmxWakeupHandler(), InitInput(), InitOutput(), and othUSBGetInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogArgs ( dmxLogLevel  logLevel, void dmxLogArgs (dmxLogLevel  logLevel,
int  argc, int  argc,
char **  argvchar **  argv 
) )
-
- - - - - -
-   - - -

-Print argc messages, each describing an element in argv. This is maingly for debugging purposes.

-

- - - - -
- + +
+

Print argc messages, each describing an element in argv. This is maingly for debugging purposes.

+ +

References dmxLog().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogCont ( dmxLogLevel  logLevel, void dmxLogCont (dmxLogLevel  logLevel,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a log message without printing the message prefix.

-

- - - - -
- + +
+

Continue a log message without printing the message prefix.

+ +

References dmxMessage().

+ +

Referenced by dmxInputLogDevices(), and dmxStatCallback().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogInput ( DMXInputInfo *  dmxInput, void dmxLogInput (DMXInputInfo *  dmxInput,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log an informational message (at level dmxInfo) related to input. The message prefix will contain information from dmxInput.

-

- - - - -
- + +
+

Log an informational message (at level dmxInfo) related to input. The message prefix will contain information from dmxInput.

+ +

References dmxHeader(), dmxInfo, and dmxMessage().

+ +

Referenced by dmxAddDevice(), dmxCommonKbdGetInfo(), dmxCommonRestoreState(), dmxCommonSaveState(), dmxEnqueue(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputAttachOld(), dmxInputDetach(), dmxInputInit(), dmxInputScanForExtensions(), and dmxKeyboardOn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogInputCont ( DMXInputInfo *  dmxInput, void dmxLogInputCont (DMXInputInfo *  dmxInput,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a message related to input without printing the message prefix.

-

- - - - -
- + +
+

Continue a message related to input without printing the message prefix.

+ +

References dmxInfo, and dmxMessage().

+ +

Referenced by dmxKeyboardOn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutput ( DMXScreenInfo *  dmxScreen, void dmxLogOutput (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log an informational message (at level dmxInfo) related to ouput. The message prefix will contain backend information from dmxScreen.

-

- - - - -
- + +
+

Log an informational message (at level dmxInfo) related to ouput. The message prefix will contain backend information from dmxScreen.

+ +

References dmxHeader(), dmxInfo, and dmxMessage().

+ +

Referenced by _dmxDPMSInit(), dmxAttachScreen(), dmxDetachScreen(), dmxGetScreenAttribs(), dmxInitOrigins(), dmxInitOverlap(), dmxLogVisual(), dmxPrintScreenInfo(), dmxPropertyCheckOtherServers(), and dmxReInitOrigins().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutputCont ( DMXScreenInfo *  dmxScreen, void dmxLogOutputCont (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Continue a message related to output without printing the message prefix.

-

- - - - -
- + +
+

Continue a message related to output without printing the message prefix.

+ +

References dmxInfo, and dmxMessage().

+ +

Referenced by dmxInitOverlap(), dmxPrintOverlap(), and dmxPrintScreenInfo().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogOutputWarning ( DMXScreenInfo *  dmxScreen, void dmxLogOutputWarning (DMXScreenInfo *  dmxScreen,
const char *  format, const char *  format,
...   ... 
) )
-
- - - - - -
-   - - -

-Log a warning message (at level dmxWarning) related to output. The message prefix will contain backend information from dmxScreen.

-

- - - - -
- + +
+

Log a warning message (at level dmxWarning) related to output. The message prefix will contain backend information from dmxScreen.

+ +

References dmxHeader(), dmxMessage(), and dmxWarning.

+ +

Referenced by dmxGetScreenAttribs(), dmxPrintScreenInfo(), and dmxPropertyCheckOtherServers().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxLogVisual ( DMXScreenInfo *  dmxScreen, void dmxLogVisual (DMXScreenInfo *  dmxScreen,
XVisualInfo *  vi, XVisualInfo *  vi,
int  defaultVisualint  defaultVisual 
) )
-
- - - - - -
-   - - -

-Print messages at level dmxInfo describing the visuals in vi.

-

- - - - -
- + +
+

Print messages at level dmxInfo describing the visuals in vi.

+ +

References dmxInfo, dmxLog(), and dmxLogOutput().

+ +

Referenced by dmxConnectionBlockCallback(), and dmxGetVisualInfo().

+ +
+ + +
+
+
- - - - - - + + + + + + -
dmxLogLevel dmxSetLogLevel ( dmxLogLevel  newLevel  ) dmxLogLevel dmxSetLogLevel (dmxLogLevel  newLevel ) 
-
- - - - - -
-   - - -

-Set the default level for logging to dmxLogLevel. Returns the previous log level.

-

- - - - -
- + +
+

Set the default level for logging to dmxLogLevel. Returns the previous log level.

+ +

References dmxCurrentLogLevel, and dmxFatal.

+ +
+ + +
+
+
- - - - - - + + + + + + -
const char* dmxXInputEventName ( int  type  ) const char* dmxXInputEventName (int  type ) 
-
- - - - - -
-   - - -

-Translate a (normalized) XInput event type into a human-readable string.

+ +

+

Translate a (normalized) XInput event type into a human-readable string.

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html new file mode 100644 index 000000000..f87d72102 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html @@ -0,0 +1,102 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxmap_8c.html index b4230ca30..4f2c9c964 100644 --- a/xorg-server/hw/dmx/doc/html/dmxmap_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxmap_8c.html @@ -6,136 +6,127 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxmap.c File Reference

#include "dmxinputinit.h"
-#include "dmxmap.h"
- - - - - - - - - + + +
+

dmxmap.c File Reference

#include "dmxinputinit.h"
+#include "dmxmap.h"
+

Functions

void dmxMapInsert (DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)
void dmxMapClear (DMXLocalInputInfoPtr dmxLocal)
int dmxMapLookup (DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
+ + + +

Functions

void dmxMapInsert (DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)
void dmxMapClear (DMXLocalInputInfoPtr dmxLocal)
int dmxMapLookup (DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
-

Detailed Description

-This file implements a mapping from remote XInput event types to Xdmx XInput event types.

-The exglobals.h file defines global server-side variables with names Device* to be integers that hold the value of the type of the server-side XInput extension event.

-The client-side X11/extensions/XInput.h file defines macros with THE EXACT SAME Device* names!

-Using those macros to extract remote server event type values from the (opaque) XDevice structure is appropriate, but makes a direct mapping to the Device* integers impossible. So we use the normalized XI_Device* names for these routines.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file implements a mapping from remote XInput event types to Xdmx XInput event types.

+

The exglobals.h file defines global server-side variables with names Device* to be integers that hold the value of the type of the server-side XInput extension event.

+

The client-side X11/extensions/XInput.h file defines macros with THE EXACT SAME Device* names!

+

Using those macros to extract remote server event type values from the (opaque) XDevice structure is appropriate, but makes a direct mapping to the Device* integers impossible. So we use the normalized XI_Device* names for these routines.

+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxMapClear ( DMXLocalInputInfoPtr  dmxLocal  ) void dmxMapClear (DMXLocalInputInfoPtr  dmxLocal ) 
-
- - - - - -
-   - + +
+

Remove all mappings there were inserted with dmxMapInsert.

-

-Remove all mappings there were inserted with dmxMapInsert.

-

- - - - -
- +

References DMX_MAP_ENTRIES, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, and _DMXEventMap::remote.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxMapInsert ( DMXLocalInputInfoPtr  dmxLocal, void dmxMapInsert (DMXLocalInputInfoPtr  dmxLocal,
int  remoteEvent, int  remoteEvent,
int  serverEventint  serverEvent 
) )
-
- - - - - -
-   - + +
+

Create a mapping from remoteEvent to serverEvent. The remoteEvent is the type returned from the remote server. The serverEvent is from the XI_* list of events in include/extensions/XIproto.h.

-

-Create a mapping from remoteEvent to serverEvent. The remoteEvent is the type returned from the remote server. The serverEvent is from the XI_* list of events in include/extensions/XIproto.h.

-

- - - - -
- +

References DMX_MAP_ENTRIES, DMX_MAP_MASK, dmxLog(), dmxWarning, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, _DMXEventMap::remote, and _DMXEventMap::server.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxMapLookup ( DMXLocalInputInfoPtr  dmxLocal, int dmxMapLookup (DMXLocalInputInfoPtr  dmxLocal,
int  remoteEventint  remoteEvent 
) )
-
- - - - - -
-   - + +
+

Lookup a mapping for remoteEvent. The remoteEvent is the type returned from the remote server. The return value is that which was passed into dmxMapInsert (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.

-

-Lookup a mapping for remoteEvent. The remoteEvent is the type returned from the remote server. The return value is that which was passed into dmxMapInsert (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.

+

References DMX_MAP_ENTRIES, DMX_MAP_MASK, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, _DMXEventMap::remote, and _DMXEventMap::server.

+ +

Referenced by dmxTranslateAndEnqueueExtEvent().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html deleted file mode 100644 index 8a9d6b31c..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxmap.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2003 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  */
-00033 
-00037 #ifndef _DMXMAP_H_
-00038 #define _DMXMAP_H_
-00039 extern void dmxMapInsert(DMXLocalInputInfoPtr dmxLocal,
-00040                          int remoteEvent, int serverEvent);
-00041 extern void dmxMapClear(DMXLocalInputInfoPtr dmxLocal);
-00042 extern int  dmxMapLookup(DMXLocalInputInfoPtr dmxLocal, int remoteEvent);
-00043 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h.html index db69ac6b2..6bf841b00 100644 --- a/xorg-server/hw/dmx/doc/html/dmxmap_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxmap_8h.html @@ -6,134 +6,125 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxmap.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxMapInsert (DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)
void dmxMapClear (DMXLocalInputInfoPtr dmxLocal)
int dmxMapLookup (DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
+ + + +

Functions

void dmxMapInsert (DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)
void dmxMapClear (DMXLocalInputInfoPtr dmxLocal)
int dmxMapLookup (DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
-

Detailed Description

-Interface to XInput event mapping support.
See also:
dmxmap.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to XInput event mapping support.

+
See also:
dmxmap.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxMapClear ( DMXLocalInputInfoPtr  dmxLocal  ) void dmxMapClear (DMXLocalInputInfoPtr  dmxLocal ) 
-
- - - - - -
-   - + +
+

Remove all mappings there were inserted with dmxMapInsert.

-

-Remove all mappings there were inserted with dmxMapInsert.

-

- - - - -
- +

References DMX_MAP_ENTRIES, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, and _DMXEventMap::remote.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxMapInsert ( DMXLocalInputInfoPtr  dmxLocal, void dmxMapInsert (DMXLocalInputInfoPtr  dmxLocal,
int  remoteEvent, int  remoteEvent,
int  serverEventint  serverEvent 
) )
-
- - - - - -
-   - + +
+

Create a mapping from remoteEvent to serverEvent. The remoteEvent is the type returned from the remote server. The serverEvent is from the XI_* list of events in include/extensions/XIproto.h.

-

-Create a mapping from remoteEvent to serverEvent. The remoteEvent is the type returned from the remote server. The serverEvent is from the XI_* list of events in include/extensions/XIproto.h.

-

- - - - -
- +

References DMX_MAP_ENTRIES, DMX_MAP_MASK, dmxLog(), dmxWarning, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, _DMXEventMap::remote, and _DMXEventMap::server.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
int dmxMapLookup ( DMXLocalInputInfoPtr  dmxLocal, int dmxMapLookup (DMXLocalInputInfoPtr  dmxLocal,
int  remoteEventint  remoteEvent 
) )
-
- - - - - -
-   - + +
+

Lookup a mapping for remoteEvent. The remoteEvent is the type returned from the remote server. The return value is that which was passed into dmxMapInsert (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.

-

-Lookup a mapping for remoteEvent. The remoteEvent is the type returned from the remote server. The return value is that which was passed into dmxMapInsert (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.

+

References DMX_MAP_ENTRIES, DMX_MAP_MASK, _DMXLocalInputInfo::map, _DMXLocalInputInfo::mapOptimize, _DMXEventMap::remote, and _DMXEventMap::server.

+ +

Referenced by dmxTranslateAndEnqueueExtEvent().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html new file mode 100644 index 000000000..191eb7c86 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html @@ -0,0 +1,75 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html index ecf9922a6..76e0babad 100644 --- a/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html @@ -6,167 +6,186 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxmotion.c File Reference

#include "inputstr.h"
-#include "dmxinputinit.h"
-#include "dmxcommon.h"
-#include "dmxmotion.h"
- - - - - - - - - + + +
+

dmxmotion.c File Reference

#include "inputstr.h"
+#include "dmxinputinit.h"
+#include "dmxcommon.h"
+#include "dmxmotion.h"
+

Functions

int dmxPointerGetMotionBufferSize (void)
int dmxPointerGetMotionEvents (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)
void dmxPointerPutMotionEvent (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)
+ + + + + +

Defines

#define OFFSET(offset, element)   ((offset) * (numAxes + 1) + (element))

Functions

int dmxPointerGetMotionBufferSize (void)
int dmxPointerGetMotionEvents (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)
void dmxPointerPutMotionEvent (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)
-

Detailed Description

-This file provides functions similar to miPointerGetMotionEvents and miPointerPutMotionEvents, with the exception that devices with more than two axes are fully supported. These routines may be used only for motion buffers for extension devices, and are not compatible replacements for the mi routines.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides functions similar to miPointerGetMotionEvents and miPointerPutMotionEvents, with the exception that devices with more than two axes are fully supported. These routines may be used only for motion buffers for extension devices, and are not compatible replacements for the mi routines.

+

Define Documentation

+ +
+
+
+ + + + + - - - - - - + + + + + + +
#define OFFSET(offset,
int dmxPointerGetMotionBufferSize ( void   ) element  )    ((offset) * (numAxes + 1) + (element))
+ +
+ +

Referenced by dmxPointerGetMotionEvents(), and dmxPointerPutMotionEvent().

+
+ +

Function Documentation

+ +
+
+ + + + + + + + +
int dmxPointerGetMotionBufferSize (void  ) 
-
- - - - - -
-   - + +
+

Return size of motion buffer.

+
See also:
DMX_MOTION_SIZE
-

-Return size of motion buffer.

See also:
DMX_MOTION_SIZE
-
-

- - - - -
- +

References DMX_MOTION_SIZE.

+ +

Referenced by dmxDeviceOnOff().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPointerGetMotionEvents ( DeviceIntPtr  pDevice, int dmxPointerGetMotionEvents (DeviceIntPtr  pDevice,
xTimecoord *  coords, xTimecoord *  coords,
unsigned long  start, unsigned long  start,
unsigned long  stop, unsigned long  stop,
ScreenPtr  pScreenScreenPtr  pScreen 
) )
-
- - - - - -
-   - + +
+

This routine performs the same function as miPointerGetMotionEvents: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator->numMotionEvents events. This routine is called from Xi/gtmotion.c with coords large enough to hold the same number of events in a variable-length extended xTimecoord structure. This provides sufficient data for the XGetDeviceMotionEvents library call, and would be identical to miPointerGetMotionEvents for devices with only 2 axes (i.e., core pointers) if xTimecoord used 32bit integers.

+

Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.

-

-This routine performs the same function as miPointerGetMotionEvents: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator->numMotionEvents events. This routine is called from Xi/gtmotion.c with coords large enough to hold the same number of events in a variable-length extended xTimecoord structure. This provides sufficient data for the XGetDeviceMotionEvents library call, and would be identical to miPointerGetMotionEvents for devices with only 2 axes (i.e., core pointers) if xTimecoord used 32bit integers.

-Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.

-

- - - - -
- +

References DMX_MOTION_SIZE, GETDMXLOCALFROMPDEVICE, and OFFSET.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPointerPutMotionEvent ( DeviceIntPtr  pDevice, void dmxPointerPutMotionEvent (DeviceIntPtr  pDevice,
int  firstAxis, int  firstAxis,
int  axesCount, int  axesCount,
int *  v, int *  v,
unsigned long  timeunsigned long  time 
) )
-
- - - - - -
-   - + +
+

This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.

-

-This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.

+

References DMX_MOTION_SIZE, GETDMXLOCALFROMPDEVICE, and OFFSET.

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html deleted file mode 100644 index 1057b7ebb..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxmotion.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXMOTION_H_
-00039 #define _DMXMOTION_H_
-00040 
-00041 extern int  dmxPointerGetMotionBufferSize(void);
-00042 extern int  dmxPointerGetMotionEvents(DeviceIntPtr pDevice,
-00043                                       xTimecoord *coords,
-00044                                       unsigned long start,
-00045                                       unsigned long stop,
-00046                                       ScreenPtr pScreen);
-00047 extern void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
-00048                                      int firstAxis, int axesCount, int *v,
-00049                                      unsigned long time);
-00050 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html index f3f4bedc4..47bde57c7 100644 --- a/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html @@ -6,166 +6,157 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxmotion.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

int dmxPointerGetMotionBufferSize (void)
int dmxPointerGetMotionEvents (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)
void dmxPointerPutMotionEvent (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)
+ + + +

Functions

int dmxPointerGetMotionBufferSize (void)
int dmxPointerGetMotionEvents (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)
void dmxPointerPutMotionEvent (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)
-

Detailed Description

-Interface to functions supporting motion events.
See also:
dmxmotion.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to functions supporting motion events.

+
See also:
dmxmotion.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
int dmxPointerGetMotionBufferSize ( void   ) int dmxPointerGetMotionBufferSize (void  ) 
-
- - - - - -
-   - + +
+

Return size of motion buffer.

+
See also:
DMX_MOTION_SIZE
-

-Return size of motion buffer.

See also:
DMX_MOTION_SIZE
-
-

- - - - -
- +

References DMX_MOTION_SIZE.

+ +

Referenced by dmxDeviceOnOff().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxPointerGetMotionEvents ( DeviceIntPtr  pDevice, int dmxPointerGetMotionEvents (DeviceIntPtr  pDevice,
xTimecoord *  coords, xTimecoord *  coords,
unsigned long  start, unsigned long  start,
unsigned long  stop, unsigned long  stop,
ScreenPtr  pScreenScreenPtr  pScreen 
) )
-
- - - - - -
-   - + +
+

This routine performs the same function as miPointerGetMotionEvents: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator->numMotionEvents events. This routine is called from Xi/gtmotion.c with coords large enough to hold the same number of events in a variable-length extended xTimecoord structure. This provides sufficient data for the XGetDeviceMotionEvents library call, and would be identical to miPointerGetMotionEvents for devices with only 2 axes (i.e., core pointers) if xTimecoord used 32bit integers.

+

Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.

-

-This routine performs the same function as miPointerGetMotionEvents: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator->numMotionEvents events. This routine is called from Xi/gtmotion.c with coords large enough to hold the same number of events in a variable-length extended xTimecoord structure. This provides sufficient data for the XGetDeviceMotionEvents library call, and would be identical to miPointerGetMotionEvents for devices with only 2 axes (i.e., core pointers) if xTimecoord used 32bit integers.

-Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.

-

- - - - -
- +

References DMX_MOTION_SIZE, GETDMXLOCALFROMPDEVICE, and OFFSET.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxPointerPutMotionEvent ( DeviceIntPtr  pDevice, void dmxPointerPutMotionEvent (DeviceIntPtr  pDevice,
int  firstAxis, int  firstAxis,
int  axesCount, int  axesCount,
int *  v, int *  v,
unsigned long  timeunsigned long  time 
) )
-
- - - - - -
-   - + +
+

This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.

-

-This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.

+

References DMX_MOTION_SIZE, GETDMXLOCALFROMPDEVICE, and OFFSET.

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html new file mode 100644 index 000000000..c993e6eec --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html @@ -0,0 +1,82 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8c.html b/xorg-server/hw/dmx/doc/html/dmxparse_8c.html index c984dd9f5..7438513be 100644 --- a/xorg-server/hw/dmx/doc/html/dmxparse_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxparse_8c.html @@ -6,60 +6,1380 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxparse.c File Reference

#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include "dmxparse.h"
- - - - - + + +
+

dmxparse.c File Reference

#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "dmxparse.h"
+

Functions

void dmxConfigLog (const char *format,...)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Functions

void dmxConfigLog (const char *format,...)
void * dmxConfigAlloc (unsigned long bytes)
void * dmxConfigRealloc (void *orig, unsigned long orig_bytes, unsigned long bytes)
const char * dmxConfigCopyString (const char *string, int length)
void dmxConfigFree (void *area)
DMXConfigTokenPtr dmxConfigCreateToken (int token, int line, const char *comment)
void dmxConfigFreeToken (DMXConfigTokenPtr p)
DMXConfigStringPtr dmxConfigCreateString (int token, int line, const char *comment, const char *string)
void dmxConfigFreeString (DMXConfigStringPtr p)
DMXConfigNumberPtr dmxConfigCreateNumber (int token, int line, const char *comment, int number)
void dmxConfigFreeNumber (DMXConfigNumberPtr p)
DMXConfigPairPtr dmxConfigCreatePair (int token, int line, const char *comment, int x, int y, int xsign, int ysign)
void dmxConfigFreePair (DMXConfigPairPtr p)
DMXConfigCommentPtr dmxConfigCreateComment (int token, int line, const char *comment)
void dmxConfigFreeComment (DMXConfigCommentPtr p)
DMXConfigPartDimPtr dmxConfigCreatePartDim (DMXConfigPairPtr pDim, DMXConfigPairPtr pOffset)
void dmxConfigFreePartDim (DMXConfigPartDimPtr p)
DMXConfigFullDimPtr dmxConfigCreateFullDim (DMXConfigPartDimPtr pScrn, DMXConfigPartDimPtr pRoot)
void dmxConfigFreeFullDim (DMXConfigFullDimPtr p)
DMXConfigDisplayPtr dmxConfigCreateDisplay (DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigFullDimPtr pDim, DMXConfigPairPtr pOrigin, DMXConfigTokenPtr pEnd)
void dmxConfigFreeDisplay (DMXConfigDisplayPtr p)
DMXConfigWallPtr dmxConfigCreateWall (DMXConfigTokenPtr pStart, DMXConfigPairPtr pWallDim, DMXConfigPairPtr pDisplayDim, DMXConfigStringPtr pNameList, DMXConfigTokenPtr pEnd)
void dmxConfigFreeWall (DMXConfigWallPtr p)
DMXConfigOptionPtr dmxConfigCreateOption (DMXConfigTokenPtr pStart, DMXConfigStringPtr pOption, DMXConfigTokenPtr pEnd)
void dmxConfigFreeOption (DMXConfigOptionPtr p)
const char ** dmxConfigLookupParam (DMXConfigParamPtr p, const char *key, int *argc)
DMXConfigParamPtr dmxConfigCreateParam (DMXConfigTokenPtr pStart, DMXConfigTokenPtr pOpen, DMXConfigStringPtr pParam, DMXConfigTokenPtr pClose, DMXConfigTokenPtr pEnd)
void dmxConfigFreeParam (DMXConfigParamPtr p)
DMXConfigSubPtr dmxConfigCreateSub (DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigDisplayPtr display, DMXConfigWallPtr wall, DMXConfigOptionPtr option, DMXConfigParamPtr param)
void dmxConfigFreeSub (DMXConfigSubPtr sub)
DMXConfigSubPtr dmxConfigSubComment (DMXConfigCommentPtr comment)
DMXConfigSubPtr dmxConfigSubDisplay (DMXConfigDisplayPtr display)
DMXConfigSubPtr dmxConfigSubWall (DMXConfigWallPtr wall)
DMXConfigSubPtr dmxConfigSubOption (DMXConfigOptionPtr option)
DMXConfigSubPtr dmxConfigSubParam (DMXConfigParamPtr param)
DMXConfigSubPtr dmxConfigAddSub (DMXConfigSubPtr head, DMXConfigSubPtr sub)
DMXConfigVirtualPtr dmxConfigCreateVirtual (DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigPairPtr pDim, DMXConfigTokenPtr pOpen, DMXConfigSubPtr pSubentry, DMXConfigTokenPtr pClose)
void dmxConfigFreeVirtual (DMXConfigVirtualPtr virtual)
DMXConfigEntryPtr dmxConfigCreateEntry (DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
void dmxConfigFreeEntry (DMXConfigEntryPtr entry)
DMXConfigEntryPtr dmxConfigAddEntry (DMXConfigEntryPtr head, DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
DMXConfigEntryPtr dmxConfigEntryComment (DMXConfigCommentPtr comment)
DMXConfigEntryPtr dmxConfigEntryVirtual (DMXConfigVirtualPtr virtual)
-

Detailed Description

-This file provides support routines and helper functions to be used by the DMX configuration file parser.

-Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support routines and helper functions to be used by the DMX configuration file parser.

+

Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.

+

Function Documentation

+ +
+
+
+ + + + + + + + + + + + - - - - + + + + + + + + + + + + + +
DMXConfigEntryPtr dmxConfigAddEntry (DMXConfigEntryPtr  head,
DMXConfigType  type,
void dmxConfigLog ( const char *  format, DMXConfigCommentPtr  comment,
DMXConfigVirtualPtr  virtual 
)
+ +
+ +

References dmxConfigCreateEntry(), and _DMXConfigEntry::next.

+ +

Referenced by dmxConfigNCCallback(), and dmxVDLRead().

+ +
+ + +
+
+ + + + + + + + + - - + + - - + + +
DMXConfigSubPtr dmxConfigAddSub (DMXConfigSubPtr  head,
... DMXConfigSubPtr  sub 
) )
+
+
+

References _DMXConfigSub::next.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + +
void* dmxConfigAlloc (unsigned long  bytes ) 
-
- - - - - -
-   - - -

-A general error logging routine that does not depend on the dmxLog functions.

+ +

+ +

References dmxConfigLog().

+ +

Referenced by dmxConfigCopyString(), dmxConfigCreateComment(), dmxConfigCreateDisplay(), dmxConfigCreateEntry(), dmxConfigCreateFullDim(), dmxConfigCreateNumber(), dmxConfigCreateOption(), dmxConfigCreatePair(), dmxConfigCreateParam(), dmxConfigCreatePartDim(), dmxConfigCreateString(), dmxConfigCreateSub(), dmxConfigCreateToken(), dmxConfigCreateVirtual(), dmxConfigCreateWall(), and dmxConfigPushState().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + +
const char* dmxConfigCopyString (const char *  string,
int  length 
)
+
+
+ +

References dmxConfigAlloc().

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigCommentPtr dmxConfigCreateComment (int  token,
int  line,
const char *  comment 
)
+
+
+ +

References _DMXConfigComment::comment, dmxConfigAlloc(), _DMXConfigComment::line, and _DMXConfigComment::token.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigDisplayPtr dmxConfigCreateDisplay (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pName,
DMXConfigFullDimPtr  pDim,
DMXConfigPairPtr  pOrigin,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References _DMXConfigPartDim::dim, _DMXConfigDisplay::dim, dmxConfigAlloc(), _DMXConfigDisplay::dname, _DMXConfigDisplay::end, _DMXConfigDisplay::name, _DMXConfigPartDim::offset, _DMXConfigDisplay::origin, _DMXConfigFullDim::root, _DMXConfigDisplay::rootHeight, _DMXConfigDisplay::rootWidth, _DMXConfigDisplay::rootX, _DMXConfigDisplay::rootXOrigin, _DMXConfigDisplay::rootXSign, _DMXConfigDisplay::rootY, _DMXConfigDisplay::rootYOrigin, _DMXConfigDisplay::rootYSign, _DMXConfigFullDim::scrn, _DMXConfigDisplay::scrnHeight, _DMXConfigDisplay::scrnWidth, _DMXConfigDisplay::scrnX, _DMXConfigDisplay::scrnXSign, _DMXConfigDisplay::scrnY, _DMXConfigDisplay::scrnYSign, _DMXConfigDisplay::start, _DMXConfigString::string, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigEntryPtr dmxConfigCreateEntry (DMXConfigType  type,
DMXConfigCommentPtr  comment,
DMXConfigVirtualPtr  virtual 
)
+
+
+ +

References _DMXConfigEntry::comment, dmxConfigAlloc(), dmxConfigComment, dmxConfigLog(), dmxConfigVirtual, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigAddEntry(), dmxConfigEntryComment(), and dmxConfigEntryVirtual().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXConfigFullDimPtr dmxConfigCreateFullDim (DMXConfigPartDimPtr  pScrn,
DMXConfigPartDimPtr  pRoot 
)
+
+
+ +

References dmxConfigAlloc(), _DMXConfigFullDim::root, and _DMXConfigFullDim::scrn.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigNumberPtr dmxConfigCreateNumber (int  token,
int  line,
const char *  comment,
int  number 
)
+
+
+ +

References _DMXConfigNumber::comment, dmxConfigAlloc(), _DMXConfigNumber::line, _DMXConfigNumber::number, and _DMXConfigNumber::token.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigOptionPtr dmxConfigCreateOption (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pOption,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References dmxConfigAlloc(), _DMXConfigOption::end, _DMXConfigString::next, _DMXConfigOption::option, _DMXConfigOption::start, _DMXConfigOption::string, and _DMXConfigString::string.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigPairPtr dmxConfigCreatePair (int  token,
int  line,
const char *  comment,
int  x,
int  y,
int  xsign,
int  ysign 
)
+
+
+ +

References _DMXConfigPair::comment, dmxConfigAlloc(), _DMXConfigPair::line, _DMXConfigPair::token, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigParamPtr dmxConfigCreateParam (DMXConfigTokenPtr  pStart,
DMXConfigTokenPtr  pOpen,
DMXConfigStringPtr  pParam,
DMXConfigTokenPtr  pClose,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References _DMXConfigParam::argc, _DMXConfigParam::argv, _DMXConfigParam::close, dmxConfigAlloc(), _DMXConfigParam::end, _DMXConfigString::next, _DMXConfigParam::open, _DMXConfigParam::param, _DMXConfigParam::start, and _DMXConfigString::string.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXConfigPartDimPtr dmxConfigCreatePartDim (DMXConfigPairPtr  pDim,
DMXConfigPairPtr  pOffset 
)
+
+
+ +

References _DMXConfigPartDim::dim, dmxConfigAlloc(), and _DMXConfigPartDim::offset.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigStringPtr dmxConfigCreateString (int  token,
int  line,
const char *  comment,
const char *  string 
)
+
+
+ +

References _DMXConfigString::comment, dmxConfigAlloc(), _DMXConfigString::line, _DMXConfigString::string, and _DMXConfigString::token.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigSubPtr dmxConfigCreateSub (DMXConfigType  type,
DMXConfigCommentPtr  comment,
DMXConfigDisplayPtr  display,
DMXConfigWallPtr  wall,
DMXConfigOptionPtr  option,
DMXConfigParamPtr  param 
)
+
+
+ +

References _DMXConfigSub::comment, _DMXConfigSub::display, dmxConfigAlloc(), dmxConfigComment, dmxConfigDisplay, dmxConfigLog(), dmxConfigOption, dmxConfigParam, dmxConfigWall, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigSub::type, and _DMXConfigSub::wall.

+ +

Referenced by dmxConfigSubComment(), dmxConfigSubDisplay(), dmxConfigSubOption(), dmxConfigSubParam(), and dmxConfigSubWall().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigTokenPtr dmxConfigCreateToken (int  token,
int  line,
const char *  comment 
)
+
+
+ +

References _DMXConfigToken::comment, dmxConfigAlloc(), _DMXConfigToken::line, and _DMXConfigToken::token.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigVirtualPtr dmxConfigCreateVirtual (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pName,
DMXConfigPairPtr  pDim,
DMXConfigTokenPtr  pOpen,
DMXConfigSubPtr  pSubentry,
DMXConfigTokenPtr  pClose 
)
+
+
+ +

References _DMXConfigVirtual::close, _DMXConfigVirtual::dim, dmxConfigAlloc(), _DMXConfigVirtual::height, _DMXConfigVirtual::name, _DMXConfigVirtual::open, _DMXConfigVirtual::start, _DMXConfigString::string, _DMXConfigVirtual::subentry, _DMXConfigVirtual::vname, _DMXConfigVirtual::width, _DMXConfigPair::x, and _DMXConfigPair::y.

+ +

Referenced by dmxConfigNCCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigWallPtr dmxConfigCreateWall (DMXConfigTokenPtr  pStart,
DMXConfigPairPtr  pWallDim,
DMXConfigPairPtr  pDisplayDim,
DMXConfigStringPtr  pNameList,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References _DMXConfigWall::displayDim, dmxConfigAlloc(), _DMXConfigWall::end, _DMXConfigWall::height, _DMXConfigWall::nameList, _DMXConfigWall::start, _DMXConfigWall::wallDim, _DMXConfigWall::width, _DMXConfigPair::x, _DMXConfigWall::xwall, _DMXConfigPair::y, and _DMXConfigWall::ywall.

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigEntryPtr dmxConfigEntryComment (DMXConfigCommentPtr  comment ) 
+
+
+ +

References dmxConfigComment, and dmxConfigCreateEntry().

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigEntryPtr dmxConfigEntryVirtual (DMXConfigVirtualPtr  virtual ) 
+
+
+ +

References dmxConfigCreateEntry(), and dmxConfigVirtual.

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFree (void *  area ) 
+
+
+ +

Referenced by dmxConfigFreeComment(), dmxConfigFreeDisplay(), dmxConfigFreeEntry(), dmxConfigFreeFullDim(), dmxConfigFreeNumber(), dmxConfigFreeOption(), dmxConfigFreePair(), dmxConfigFreeParam(), dmxConfigFreePartDim(), dmxConfigFreeString(), dmxConfigFreeSub(), dmxConfigFreeToken(), dmxConfigFreeVirtual(), dmxConfigFreeWall(), and dmxConfigPopState().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeComment (DMXConfigCommentPtr  p ) 
+
+
+ +

References _DMXConfigComment::comment, and dmxConfigFree().

+ +

Referenced by dmxConfigFreeEntry(), and dmxConfigFreeSub().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeDisplay (DMXConfigDisplayPtr  p ) 
+
+
+ +

References _DMXConfigDisplay::dim, dmxConfigFree(), dmxConfigFreeFullDim(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigDisplay::dname, _DMXConfigDisplay::end, and _DMXConfigDisplay::start.

+ +

Referenced by dmxConfigDDCallback(), and dmxConfigFreeSub().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeEntry (DMXConfigEntryPtr  entry ) 
+
+
+ +

References _DMXConfigEntry::comment, dmxConfigComment, dmxConfigFree(), dmxConfigFreeComment(), dmxConfigFreeVirtual(), dmxConfigLog(), dmxConfigVirtual, _DMXConfigEntry::next, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigConfigure().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeFullDim (DMXConfigFullDimPtr  p ) 
+
+
+ +

References dmxConfigFree(), dmxConfigFreePartDim(), _DMXConfigFullDim::root, and _DMXConfigFullDim::scrn.

+ +

Referenced by dmxConfigFreeDisplay().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeNumber (DMXConfigNumberPtr  p ) 
+
+
+ +

References _DMXConfigNumber::comment, and dmxConfigFree().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeOption (DMXConfigOptionPtr  p ) 
+
+
+ +

References dmxConfigFree(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigOption::end, _DMXConfigOption::option, _DMXConfigOption::start, and _DMXConfigOption::string.

+ +

Referenced by dmxConfigFreeSub().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreePair (DMXConfigPairPtr  p ) 
+
+
+ +

References _DMXConfigPair::comment, and dmxConfigFree().

+ +

Referenced by dmxConfigFreePartDim(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeParam (DMXConfigParamPtr  p ) 
+
+
+ +

References _DMXConfigParam::argv, _DMXConfigParam::close, dmxConfigFree(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigParam::end, _DMXConfigParam::next, _DMXConfigParam::open, _DMXConfigParam::param, and _DMXConfigParam::start.

+ +

Referenced by dmxConfigFreeSub().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreePartDim (DMXConfigPartDimPtr  p ) 
+
+
+ +

References _DMXConfigPartDim::dim, dmxConfigFree(), dmxConfigFreePair(), and _DMXConfigPartDim::offset.

+ +

Referenced by dmxConfigFreeFullDim().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeString (DMXConfigStringPtr  p ) 
+
+
+ +

References _DMXConfigString::comment, dmxConfigFree(), _DMXConfigString::next, and _DMXConfigString::string.

+ +

Referenced by dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeSub (DMXConfigSubPtr  sub ) 
+
+
+ +

References _DMXConfigSub::comment, _DMXConfigSub::display, dmxConfigComment, dmxConfigDisplay, dmxConfigFree(), dmxConfigFreeComment(), dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeWall(), dmxConfigLog(), dmxConfigOption, dmxConfigParam, dmxConfigWall, _DMXConfigSub::next, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigSub::type, and _DMXConfigSub::wall.

+ +

Referenced by dmxConfigFreeVirtual().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeToken (DMXConfigTokenPtr  p ) 
+
+
+ +

References _DMXConfigToken::comment, and dmxConfigFree().

+ +

Referenced by dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeVirtual (DMXConfigVirtualPtr  virtual ) 
+
+
+ +

References dmxConfigFree(), dmxConfigFreePair(), dmxConfigFreeString(), dmxConfigFreeSub(), and dmxConfigFreeToken().

+ +

Referenced by dmxConfigDCCallback(), and dmxConfigFreeEntry().

+ +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeWall (DMXConfigWallPtr  p ) 
+
+
+ +

References _DMXConfigWall::displayDim, dmxConfigFree(), dmxConfigFreePair(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigWall::end, _DMXConfigWall::nameList, _DMXConfigWall::start, and _DMXConfigWall::wallDim.

+ +

Referenced by dmxConfigFreeSub().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxConfigLog (const char *  format,
  ... 
)
+
+
+

A general error logging routine that does not depend on the dmxLog functions.

+ +

Referenced by dmxConfigAlloc(), dmxConfigCreateEntry(), dmxConfigCreateSub(), dmxConfigFreeEntry(), dmxConfigFreeSub(), dmxConfigPopState(), dmxConfigPrint(), dmxConfigPrintParam(), dmxConfigPrintSub(), dmxConfigPrintTokenFlag(), and dmxConfigRealloc().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
const char** dmxConfigLookupParam (DMXConfigParamPtr  p,
const char *  key,
int *  argc 
)
+
+
+ +

References _DMXConfigParam::argc, _DMXConfigParam::argv, and _DMXConfigParam::next.

+ +

Referenced by dmxConfigCopyFromParam().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void* dmxConfigRealloc (void *  orig,
unsigned long  orig_bytes,
unsigned long  bytes 
)
+
+
+ +

References dmxConfigLog().

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigSubPtr dmxConfigSubComment (DMXConfigCommentPtr  comment ) 
+
+
+ +

References dmxConfigComment, and dmxConfigCreateSub().

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigSubPtr dmxConfigSubDisplay (DMXConfigDisplayPtr  display ) 
+
+
+ +

References dmxConfigCreateSub(), and dmxConfigDisplay.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigSubPtr dmxConfigSubOption (DMXConfigOptionPtr  option ) 
+
+
+ +

References dmxConfigCreateSub(), and dmxConfigOption.

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigSubPtr dmxConfigSubParam (DMXConfigParamPtr  param ) 
+
+
+ +

References dmxConfigCreateSub(), and dmxConfigParam.

+ +
+
+ +
+
+ + + + + + + + + +
DMXConfigSubPtr dmxConfigSubWall (DMXConfigWallPtr  wall ) 
+
+
+ +

References dmxConfigCreateSub(), and dmxConfigWall.

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html deleted file mode 100644 index c88da9089..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html +++ /dev/null @@ -1,303 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxparse.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXPARSE_H_
-00039 #define _DMXPARSE_H_
-00040 
-00041 #include <stdio.h>              /* For FILE */
-00042 
-00044 typedef struct _DMXConfigToken {
-00045     int                      token;
-00046     int                      line;
-00047     const char               *comment;
-00048 } DMXConfigToken, *DMXConfigTokenPtr;
-00049 
-00051 typedef struct _DMXConfigString {
-00052     int                      token;
-00053     int                      line;
-00054     const char               *comment;
-00055     const char               *string;
-00056     struct _DMXConfigString  *next;
-00057 } DMXConfigString, *DMXConfigStringPtr;
-00058 
-00060 typedef struct _DMXConfigNumber {
-00061     int                      token;
-00062     int                      line;
-00063     const char               *comment;
-00064     int                      number;
-00065 } DMXConfigNumber, *DMXConfigNumberPtr;
-00066 
-00068 typedef struct _DMXConfigPair {
-00069     int                      token;
-00070     int                      line;
-00071     const char               *comment;
-00072     int                      x;
-00073     int                      y;
-00074     int                      xsign;
-00075     int                      ysign;
-00076 } DMXConfigPair, *DMXConfigPairPtr;
-00077 
-00079 typedef struct _DMXConfigComment {
-00080     int                      token;
-00081     int                      line;
-00082     const char               *comment;
-00083 } DMXConfigComment, *DMXConfigCommentPtr;
-00084 
-00085 typedef enum {
-00086     dmxConfigComment,
-00087     dmxConfigVirtual,
-00088     dmxConfigDisplay,
-00089     dmxConfigWall,
-00090     dmxConfigOption,
-00091     dmxConfigParam
-00092 } DMXConfigType;
-00093 
-00095 typedef struct _DMXConfigPartDim {
-00096     DMXConfigPairPtr         dim;
-00097     DMXConfigPairPtr         offset;
-00098 } DMXConfigPartDim, *DMXConfigPartDimPtr;
-00099 
-00101 typedef struct _DMXConfigFullDim {
-00102     DMXConfigPartDimPtr      scrn;
-00103     DMXConfigPartDimPtr      root;
-00104 } DMXConfigFullDim, *DMXConfigFullDimPtr;
-00105 
-00107 typedef struct _DMXConfigDisplay {
-00108                                 /* Summary information */
-00109     const char               *name;
-00110                                 /* Screen Window Geometry */
-00111     int                      scrnWidth, scrnHeight;
-00112     int                      scrnX, scrnY;
-00113     int                      scrnXSign, scrnYSign;
-00114                                 /* Root Window Geometry */
-00115     int                      rootWidth, rootHeight;
-00116     int                      rootX, rootY;
-00117     int                      rootXSign, rootYSign;
-00118                                 /* Origin in global space */
-00119     int                      rootXOrigin, rootYOrigin;
-00120     
-00121                                 /* Raw configuration information */
-00122     DMXConfigTokenPtr        start;
-00123     DMXConfigStringPtr       dname;
-00124     DMXConfigFullDimPtr      dim;
-00125     DMXConfigPairPtr         origin;
-00126     DMXConfigTokenPtr        end;
-00127 } DMXConfigDisplay, *DMXConfigDisplayPtr;
-00128 
-00130 typedef struct _DMXConfigWall {
-00131                                 /* Summary information */
-00132     int                      width, height; /* dimensions of displays */
-00133     int                      xwall, ywall; /* dimensions of wall, in tiles */
-00134 
-00135     
-00136                                 /* Raw configuration informaiton */
-00137     DMXConfigTokenPtr        start;
-00138     DMXConfigPairPtr         wallDim;
-00139     DMXConfigPairPtr         displayDim;
-00140     DMXConfigStringPtr       nameList;
-00141     DMXConfigTokenPtr        end;
-00142 } DMXConfigWall, *DMXConfigWallPtr;
-00143 
-00145 typedef struct _DMXConfigOption {
-00146                                 /* Summary information */
-00147     char                     *string;
-00148     
-00149                                 /* Raw configuration informaiton */
-00150     DMXConfigTokenPtr        start;
-00151     DMXConfigStringPtr       option;
-00152     DMXConfigTokenPtr        end;
-00153 } DMXConfigOption, *DMXConfigOptionPtr;
-00154 
-00156 typedef struct _DMXConfigParam {
-00157     int                      argc;
-00158     const char               **argv;
-00159     
-00160     DMXConfigTokenPtr        start;
-00161     DMXConfigTokenPtr        open;
-00162     DMXConfigStringPtr       param;
-00163     DMXConfigTokenPtr        close;
-00164     DMXConfigTokenPtr        end; /* Either open/close OR end */
-00165     struct _DMXConfigParam   *next;
-00166 } DMXConfigParam, *DMXConfigParamPtr;
-00167 
-00169 typedef struct _DMXConfigSub {
-00170     DMXConfigType             type;
-00171     DMXConfigCommentPtr       comment;
-00172     DMXConfigDisplayPtr       display;
-00173     DMXConfigWallPtr          wall;
-00174     DMXConfigOptionPtr        option;
-00175     DMXConfigParamPtr         param;
-00176     struct _DMXConfigSub      *next;
-00177 } DMXConfigSub, *DMXConfigSubPtr;
-00178 
-00180 typedef struct _DMXConfigVirtual {
-00181                                 /* Summary information */
-00182     const char                *name;
-00183     int                       width, height;
-00184 
-00185                                 /* Raw configuration information */
-00186     DMXConfigTokenPtr         start;
-00187     DMXConfigStringPtr        vname;
-00188     DMXConfigPairPtr          dim;
-00189     DMXConfigTokenPtr         open;
-00190     DMXConfigSubPtr           subentry;
-00191     DMXConfigTokenPtr         close;
-00192 } DMXConfigVirtual, *DMXConfigVirtualPtr;
-00193 
-00195 typedef struct _DMXConfigEntry {
-00196     DMXConfigType            type;
-00197     DMXConfigCommentPtr      comment;
-00198     DMXConfigVirtualPtr      virtual;
-00199     struct _DMXConfigEntry   *next;
-00200 } DMXConfigEntry, *DMXConfigEntryPtr;
-00201 
-00202 extern DMXConfigEntryPtr   dmxConfigEntry;
-00203 
-00204 extern int                 yylex(void);
-00205 extern int                 yydebug;
-00206 extern void                yyerror(const char *message);
-00207 
-00208 extern void                dmxConfigLog(const char *format, ...);
-00209 extern void                *dmxConfigAlloc(unsigned long bytes);
-00210 extern void                *dmxConfigRealloc(void *orig,
-00211                                              unsigned long orig_bytes,
-00212                                              unsigned long bytes);
-00213 extern const char          *dmxConfigCopyString(const char *string,
-00214                                                 int length);
-00215 extern void                dmxConfigFree(void *area);
-00216 extern DMXConfigTokenPtr   dmxConfigCreateToken(int token, int line,
-00217                                                 const char *comment);
-00218 extern void                dmxConfigFreeToken(DMXConfigTokenPtr p);
-00219 extern DMXConfigStringPtr  dmxConfigCreateString(int token, int line,
-00220                                                  const char *comment,
-00221                                                  const char *string);
-00222 extern void                dmxConfigFreeString(DMXConfigStringPtr p);
-00223 extern DMXConfigNumberPtr  dmxConfigCreateNumber(int token, int line,
-00224                                                  const char *comment,
-00225                                                  int number);
-00226 extern void                dmxConfigFreeNumber(DMXConfigNumberPtr p);
-00227 extern DMXConfigPairPtr    dmxConfigCreatePair(int token, int line,
-00228                                                const char *comment,
-00229                                                int x, int y,
-00230                                                int xsign, int ysign);
-00231 extern void                dmxConfigFreePair(DMXConfigPairPtr p);
-00232 extern DMXConfigCommentPtr dmxConfigCreateComment(int token, int line,
-00233                                                   const char *comment);
-00234 extern void                dmxConfigFreeComment(DMXConfigCommentPtr p);
-00235 extern DMXConfigPartDimPtr dmxConfigCreatePartDim(DMXConfigPairPtr pDim,
-00236                                                   DMXConfigPairPtr pOffset);
-00237 extern void                dmxConfigFreePartDim(DMXConfigPartDimPtr p);
-00238 extern DMXConfigFullDimPtr dmxConfigCreateFullDim(DMXConfigPartDimPtr pScrn,
-00239                                                   DMXConfigPartDimPtr pRoot);
-00240 extern void                dmxConfigFreeFullDim(DMXConfigFullDimPtr p);
-00241 extern DMXConfigDisplayPtr dmxConfigCreateDisplay(DMXConfigTokenPtr pStart,
-00242                                                   DMXConfigStringPtr pName,
-00243                                                   DMXConfigFullDimPtr pDim,
-00244                                                   DMXConfigPairPtr pOrigin,
-00245                                                   DMXConfigTokenPtr pEnd);
-00246 extern void                dmxConfigFreeDisplay(DMXConfigDisplayPtr p);
-00247 extern DMXConfigWallPtr    dmxConfigCreateWall(DMXConfigTokenPtr pStart,
-00248                                                DMXConfigPairPtr pWallDim,
-00249                                                DMXConfigPairPtr pDisplayDim,
-00250                                                DMXConfigStringPtr pNameList,
-00251                                                DMXConfigTokenPtr pEnd);
-00252 extern void                dmxConfigFreeWall(DMXConfigWallPtr p);
-00253 extern DMXConfigOptionPtr  dmxConfigCreateOption(DMXConfigTokenPtr pStart,
-00254                                                  DMXConfigStringPtr pOption,
-00255                                                  DMXConfigTokenPtr pEnd);
-00256 extern void                dmxConfigFreeOption(DMXConfigOptionPtr p);
-00257 extern DMXConfigParamPtr   dmxConfigCreateParam(DMXConfigTokenPtr pStart,
-00258                                                 DMXConfigTokenPtr pOpen,
-00259                                                 DMXConfigStringPtr pParam,
-00260                                                 DMXConfigTokenPtr pClose,
-00261                                                 DMXConfigTokenPtr pEnd);
-00262 extern void                dmxConfigFreeParam(DMXConfigParamPtr p);
-00263 extern const char          **dmxConfigLookupParam(DMXConfigParamPtr p,
-00264                                                   const char *key,
-00265                                                   int *argc);
-00266 extern DMXConfigSubPtr     dmxConfigCreateSub(DMXConfigType type,
-00267                                               DMXConfigCommentPtr comment,
-00268                                               DMXConfigDisplayPtr display,
-00269                                               DMXConfigWallPtr wall,
-00270                                               DMXConfigOptionPtr option,
-00271                                               DMXConfigParamPtr param);
-00272 extern void                dmxConfigFreeSub(DMXConfigSubPtr sub);
-00273 extern DMXConfigSubPtr     dmxConfigSubComment(DMXConfigCommentPtr comment);
-00274 extern DMXConfigSubPtr     dmxConfigSubDisplay(DMXConfigDisplayPtr display);
-00275 extern DMXConfigSubPtr     dmxConfigSubWall(DMXConfigWallPtr wall);
-00276 extern DMXConfigSubPtr     dmxConfigSubOption(DMXConfigOptionPtr option);
-00277 extern DMXConfigSubPtr     dmxConfigSubParam(DMXConfigParamPtr param);
-00278 extern DMXConfigSubPtr     dmxConfigAddSub(DMXConfigSubPtr head,
-00279                                            DMXConfigSubPtr sub);
-00280 extern DMXConfigVirtualPtr dmxConfigCreateVirtual(DMXConfigTokenPtr pStart,
-00281                                                   DMXConfigStringPtr pName,
-00282                                                   DMXConfigPairPtr pDim,
-00283                                                   DMXConfigTokenPtr pOpen,
-00284                                                   DMXConfigSubPtr pSubentry,
-00285                                                   DMXConfigTokenPtr pClose);
-00286 extern void                dmxConfigFreeVirtual(DMXConfigVirtualPtr virtual);
-00287 extern DMXConfigEntryPtr   dmxConfigCreateEntry(DMXConfigType type,
-00288                                                 DMXConfigCommentPtr comment,
-00289                                                 DMXConfigVirtualPtr virtual);
-00290 extern void                dmxConfigFreeEntry(DMXConfigEntryPtr entry);
-00291 extern DMXConfigEntryPtr   dmxConfigAddEntry(DMXConfigEntryPtr head,
-00292                                              DMXConfigType type,
-00293                                              DMXConfigCommentPtr comment,
-00294                                              DMXConfigVirtualPtr virtual);
-00295 extern DMXConfigEntryPtr   dmxConfigEntryComment(DMXConfigCommentPtr comment);
-00296 extern DMXConfigEntryPtr   dmxConfigEntryVirtual(DMXConfigVirtualPtr virtual);
-00297 
-00298 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h.html index 410075337..989fb475c 100644 --- a/xorg-server/hw/dmx/doc/html/dmxparse_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxparse_8h.html @@ -6,761 +6,1914 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxparse.h File Reference

#include <stdio.h>
+ + +
+

dmxparse.h File Reference

#include <stdio.h>
+ +

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _DMXConfigToken
struct  _DMXConfigString
struct  _DMXConfigNumber
struct  _DMXConfigPair
struct  _DMXConfigComment
struct  _DMXConfigPartDim
struct  _DMXConfigFullDim
struct  _DMXConfigDisplay
struct  _DMXConfigWall
struct  _DMXConfigOption
struct  _DMXConfigParam
struct  _DMXConfigSub
struct  _DMXConfigVirtual
struct  _DMXConfigEntry

Typedefs

typedef struct _DMXConfigToken DMXConfigToken
typedef struct _DMXConfigToken * DMXConfigTokenPtr
typedef struct _DMXConfigString DMXConfigString
typedef struct _DMXConfigString * DMXConfigStringPtr
typedef struct _DMXConfigNumber DMXConfigNumber
typedef struct _DMXConfigNumber * DMXConfigNumberPtr
typedef struct _DMXConfigPair DMXConfigPair
typedef struct _DMXConfigPair * DMXConfigPairPtr
typedef struct _DMXConfigComment DMXConfigComment
typedef struct _DMXConfigComment * DMXConfigCommentPtr
typedef struct _DMXConfigPartDim DMXConfigPartDim
typedef struct _DMXConfigPartDim * DMXConfigPartDimPtr
typedef struct _DMXConfigFullDim DMXConfigFullDim
typedef struct _DMXConfigFullDim * DMXConfigFullDimPtr
typedef struct _DMXConfigDisplay DMXConfigDisplay
typedef struct _DMXConfigDisplay * DMXConfigDisplayPtr
typedef struct _DMXConfigWall DMXConfigWall
typedef struct _DMXConfigWall * DMXConfigWallPtr
typedef struct _DMXConfigOption DMXConfigOption
typedef struct _DMXConfigOption * DMXConfigOptionPtr
typedef struct _DMXConfigParam DMXConfigParam
typedef struct _DMXConfigParam * DMXConfigParamPtr
typedef struct _DMXConfigSub DMXConfigSub
typedef struct _DMXConfigSub * DMXConfigSubPtr
typedef struct _DMXConfigVirtual DMXConfigVirtual
typedef struct _DMXConfigVirtual * DMXConfigVirtualPtr
typedef struct _DMXConfigEntry DMXConfigEntry
typedef struct _DMXConfigEntry * DMXConfigEntryPtr

Enumerations

enum  DMXConfigType {
+  dmxConfigComment, +dmxConfigVirtual, +dmxConfigDisplay, +dmxConfigWall, +
+  dmxConfigOption, +dmxConfigParam +
+ }

Functions

int yylex (void)
void yyerror (const char *message)
void dmxConfigLog (const char *format,...)
void * dmxConfigAlloc (unsigned long bytes)
void * dmxConfigRealloc (void *orig, unsigned long orig_bytes, unsigned long bytes)
const char * dmxConfigCopyString (const char *string, int length)
void dmxConfigFree (void *area)
DMXConfigTokenPtr dmxConfigCreateToken (int token, int line, const char *comment)
void dmxConfigFreeToken (DMXConfigTokenPtr p)
DMXConfigStringPtr dmxConfigCreateString (int token, int line, const char *comment, const char *string)
void dmxConfigFreeString (DMXConfigStringPtr p)
DMXConfigNumberPtr dmxConfigCreateNumber (int token, int line, const char *comment, int number)
void dmxConfigFreeNumber (DMXConfigNumberPtr p)
DMXConfigPairPtr dmxConfigCreatePair (int token, int line, const char *comment, int x, int y, int xsign, int ysign)
void dmxConfigFreePair (DMXConfigPairPtr p)
DMXConfigCommentPtr dmxConfigCreateComment (int token, int line, const char *comment)
void dmxConfigFreeComment (DMXConfigCommentPtr p)
DMXConfigPartDimPtr dmxConfigCreatePartDim (DMXConfigPairPtr pDim, DMXConfigPairPtr pOffset)
void dmxConfigFreePartDim (DMXConfigPartDimPtr p)
DMXConfigFullDimPtr dmxConfigCreateFullDim (DMXConfigPartDimPtr pScrn, DMXConfigPartDimPtr pRoot)
void dmxConfigFreeFullDim (DMXConfigFullDimPtr p)
DMXConfigDisplayPtr dmxConfigCreateDisplay (DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigFullDimPtr pDim, DMXConfigPairPtr pOrigin, DMXConfigTokenPtr pEnd)
void dmxConfigFreeDisplay (DMXConfigDisplayPtr p)
DMXConfigWallPtr dmxConfigCreateWall (DMXConfigTokenPtr pStart, DMXConfigPairPtr pWallDim, DMXConfigPairPtr pDisplayDim, DMXConfigStringPtr pNameList, DMXConfigTokenPtr pEnd)
void dmxConfigFreeWall (DMXConfigWallPtr p)
DMXConfigOptionPtr dmxConfigCreateOption (DMXConfigTokenPtr pStart, DMXConfigStringPtr pOption, DMXConfigTokenPtr pEnd)
void dmxConfigFreeOption (DMXConfigOptionPtr p)
DMXConfigParamPtr dmxConfigCreateParam (DMXConfigTokenPtr pStart, DMXConfigTokenPtr pOpen, DMXConfigStringPtr pParam, DMXConfigTokenPtr pClose, DMXConfigTokenPtr pEnd)
void dmxConfigFreeParam (DMXConfigParamPtr p)
const char ** dmxConfigLookupParam (DMXConfigParamPtr p, const char *key, int *argc)
DMXConfigSubPtr dmxConfigCreateSub (DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigDisplayPtr display, DMXConfigWallPtr wall, DMXConfigOptionPtr option, DMXConfigParamPtr param)
void dmxConfigFreeSub (DMXConfigSubPtr sub)
DMXConfigSubPtr dmxConfigSubComment (DMXConfigCommentPtr comment)
DMXConfigSubPtr dmxConfigSubDisplay (DMXConfigDisplayPtr display)
DMXConfigSubPtr dmxConfigSubWall (DMXConfigWallPtr wall)
DMXConfigSubPtr dmxConfigSubOption (DMXConfigOptionPtr option)
DMXConfigSubPtr dmxConfigSubParam (DMXConfigParamPtr param)
DMXConfigSubPtr dmxConfigAddSub (DMXConfigSubPtr head, DMXConfigSubPtr sub)
DMXConfigVirtualPtr dmxConfigCreateVirtual (DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigPairPtr pDim, DMXConfigTokenPtr pOpen, DMXConfigSubPtr pSubentry, DMXConfigTokenPtr pClose)
void dmxConfigFreeVirtual (DMXConfigVirtualPtr virtual)
DMXConfigEntryPtr dmxConfigCreateEntry (DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
void dmxConfigFreeEntry (DMXConfigEntryPtr entry)
DMXConfigEntryPtr dmxConfigAddEntry (DMXConfigEntryPtr head, DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
DMXConfigEntryPtr dmxConfigEntryComment (DMXConfigCommentPtr comment)
DMXConfigEntryPtr dmxConfigEntryVirtual (DMXConfigVirtualPtr virtual)

Variables

DMXConfigEntryPtr dmxConfigEntry
int yydebug
+

Detailed Description

+

Interface to DMX configuration file parser.

+
See also:
dmxparse.c
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _DMXConfigComment DMXConfigComment
+
+
+

Stores parsed comments not stored with a token.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigComment * DMXConfigCommentPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigDisplay DMXConfigDisplay
+
+
+

Stores parsed display information.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigDisplay * DMXConfigDisplayPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigEntry DMXConfigEntry
+
+
+

Heads entry storage.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigEntry * DMXConfigEntryPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigFullDim DMXConfigFullDim
+
+
+

Stores a pair of geometry specifications.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigFullDim * DMXConfigFullDimPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigNumber DMXConfigNumber
+
+
+

Stores parsed numbers.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigNumber * DMXConfigNumberPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigOption DMXConfigOption
+
+
+

Stores parsed option information.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigOption * DMXConfigOptionPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigPair DMXConfigPair
+
+
+

Stores parsed pairs (e.g., x y)

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigPair * DMXConfigPairPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigParam DMXConfigParam
+
+
+

Stores parsed param information.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigParam * DMXConfigParamPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigPartDim DMXConfigPartDim
+
+
+

Stores a geometry specification.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigPartDim * DMXConfigPartDimPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigString DMXConfigString
+
+
+

Stores parsed strings.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigString * DMXConfigStringPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigSub DMXConfigSub
+
+
+

Stores options under an entry (subentry).

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigSub * DMXConfigSubPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigToken DMXConfigToken
+
+
+

Stores tokens not stored in other structures (e.g., keywords and ;)

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigToken * DMXConfigTokenPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigVirtual DMXConfigVirtual
+
+
+

Stores parsed virtual information.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigVirtual * DMXConfigVirtualPtr
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigWall DMXConfigWall
+
+
+

Stores parsed wall information.

+ +
+
+ +
+
+ + + + +
typedef struct _DMXConfigWall * DMXConfigWallPtr
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum DMXConfigType
+
+
+
Enumerator:
+ + + + + + +
dmxConfigComment  +
dmxConfigVirtual  +
dmxConfigDisplay  +
dmxConfigWall  +
dmxConfigOption  +
dmxConfigParam  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigEntryPtr dmxConfigAddEntry (DMXConfigEntryPtr  head,
DMXConfigType  type,
DMXConfigCommentPtr  comment,
DMXConfigVirtualPtr  virtual 
)
+
+
+ +

References dmxConfigCreateEntry(), and _DMXConfigEntry::next.

+ +

Referenced by dmxConfigNCCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXConfigSubPtr dmxConfigAddSub (DMXConfigSubPtr  head,
DMXConfigSubPtr  sub 
)
+
+
+ +

References _DMXConfigSub::next.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + +
void* dmxConfigAlloc (unsigned long  bytes ) 
+
+
+ +

References dmxConfigLog().

+ +

Referenced by dmxConfigCopyString(), dmxConfigCreateComment(), dmxConfigCreateDisplay(), dmxConfigCreateEntry(), dmxConfigCreateFullDim(), dmxConfigCreateNumber(), dmxConfigCreateOption(), dmxConfigCreatePair(), dmxConfigCreateParam(), dmxConfigCreatePartDim(), dmxConfigCreateString(), dmxConfigCreateSub(), dmxConfigCreateToken(), dmxConfigCreateVirtual(), dmxConfigCreateWall(), and dmxConfigPushState().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
const char* dmxConfigCopyString (const char *  string,
int  length 
)
+
+
+ +

References dmxConfigAlloc().

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigCommentPtr dmxConfigCreateComment (int  token,
int  line,
const char *  comment 
)
+
+
-

-Go to the source code of this file. - - - +

References _DMXConfigComment::comment, dmxConfigAlloc(), _DMXConfigComment::line, and _DMXConfigComment::token.

- +

Referenced by dmxVDLRead().

+ + + + +
+
+

Data Structures

struct  _DMXConfigComment
struct  _DMXConfigDisplay
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigDisplayPtr dmxConfigCreateDisplay (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pName,
DMXConfigFullDimPtr  pDim,
DMXConfigPairPtr  pOrigin,
DMXConfigTokenPtr  pEnd 
)
+

+
+ +

References _DMXConfigPartDim::dim, _DMXConfigDisplay::dim, dmxConfigAlloc(), _DMXConfigDisplay::dname, _DMXConfigDisplay::end, _DMXConfigDisplay::name, _DMXConfigPartDim::offset, _DMXConfigDisplay::origin, _DMXConfigFullDim::root, _DMXConfigDisplay::rootHeight, _DMXConfigDisplay::rootWidth, _DMXConfigDisplay::rootX, _DMXConfigDisplay::rootXOrigin, _DMXConfigDisplay::rootXSign, _DMXConfigDisplay::rootY, _DMXConfigDisplay::rootYOrigin, _DMXConfigDisplay::rootYSign, _DMXConfigFullDim::scrn, _DMXConfigDisplay::scrnHeight, _DMXConfigDisplay::scrnWidth, _DMXConfigDisplay::scrnX, _DMXConfigDisplay::scrnXSign, _DMXConfigDisplay::scrnY, _DMXConfigDisplay::scrnYSign, _DMXConfigDisplay::start, _DMXConfigString::string, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigEntryPtr dmxConfigCreateEntry (DMXConfigType  type,
DMXConfigCommentPtr  comment,
DMXConfigVirtualPtr  virtual 
)
+
+
+ +

References _DMXConfigEntry::comment, dmxConfigAlloc(), dmxConfigComment, dmxConfigLog(), dmxConfigVirtual, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigAddEntry(), dmxConfigEntryComment(), and dmxConfigEntryVirtual().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXConfigFullDimPtr dmxConfigCreateFullDim (DMXConfigPartDimPtr  pScrn,
DMXConfigPartDimPtr  pRoot 
)
+
+
+ +

References dmxConfigAlloc(), _DMXConfigFullDim::root, and _DMXConfigFullDim::scrn.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigNumberPtr dmxConfigCreateNumber (int  token,
int  line,
const char *  comment,
int  number 
)
+
+
+ +

References _DMXConfigNumber::comment, dmxConfigAlloc(), _DMXConfigNumber::line, _DMXConfigNumber::number, and _DMXConfigNumber::token.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigOptionPtr dmxConfigCreateOption (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pOption,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References dmxConfigAlloc(), _DMXConfigOption::end, _DMXConfigString::next, _DMXConfigOption::option, _DMXConfigOption::start, _DMXConfigOption::string, and _DMXConfigString::string.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigPairPtr dmxConfigCreatePair (int  token,
int  line,
const char *  comment,
int  x,
int  y,
int  xsign,
int  ysign 
)
+
+
+ +

References _DMXConfigPair::comment, dmxConfigAlloc(), _DMXConfigPair::line, _DMXConfigPair::token, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigParamPtr dmxConfigCreateParam (DMXConfigTokenPtr  pStart,
DMXConfigTokenPtr  pOpen,
DMXConfigStringPtr  pParam,
DMXConfigTokenPtr  pClose,
DMXConfigTokenPtr  pEnd 
)
+
+
+ +

References _DMXConfigParam::argc, _DMXConfigParam::argv, _DMXConfigParam::close, dmxConfigAlloc(), _DMXConfigParam::end, _DMXConfigString::next, _DMXConfigParam::open, _DMXConfigParam::param, _DMXConfigParam::start, and _DMXConfigString::string.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
DMXConfigPartDimPtr dmxConfigCreatePartDim (DMXConfigPairPtr  pDim,
DMXConfigPairPtr  pOffset 
)
+
+
+ +

References _DMXConfigPartDim::dim, dmxConfigAlloc(), and _DMXConfigPartDim::offset.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigStringPtr dmxConfigCreateString (int  token,
int  line,
const char *  comment,
const char *  string 
)
+
+
+ +

References _DMXConfigString::comment, dmxConfigAlloc(), _DMXConfigString::line, _DMXConfigString::string, and _DMXConfigString::token.

+ +

Referenced by dmxVDLRead().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigSubPtr dmxConfigCreateSub (DMXConfigType  type,
DMXConfigCommentPtr  comment,
DMXConfigDisplayPtr  display,
DMXConfigWallPtr  wall,
DMXConfigOptionPtr  option,
DMXConfigParamPtr  param 
)
+
+
+ +

References _DMXConfigSub::comment, _DMXConfigSub::display, dmxConfigAlloc(), dmxConfigComment, dmxConfigDisplay, dmxConfigLog(), dmxConfigOption, dmxConfigParam, dmxConfigWall, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigSub::type, and _DMXConfigSub::wall.

+ +

Referenced by dmxConfigSubComment(), dmxConfigSubDisplay(), dmxConfigSubOption(), dmxConfigSubParam(), and dmxConfigSubWall().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigTokenPtr dmxConfigCreateToken (int  token,
int  line,
const char *  comment 
)
+
+
-
struct  _DMXConfigEntry
struct  _DMXConfigFullDim
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigVirtualPtr dmxConfigCreateVirtual (DMXConfigTokenPtr  pStart,
DMXConfigStringPtr  pName,
DMXConfigPairPtr  pDim,
DMXConfigTokenPtr  pOpen,
DMXConfigSubPtr  pSubentry,
DMXConfigTokenPtr  pClose 
)
+ +

-
struct  _DMXConfigNumber
struct  _DMXConfigOption
struct  _DMXConfigPair
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DMXConfigWallPtr dmxConfigCreateWall (DMXConfigTokenPtr  pStart,
DMXConfigPairPtr  pWallDim,
DMXConfigPairPtr  pDisplayDim,
DMXConfigStringPtr  pNameList,
DMXConfigTokenPtr  pEnd 
)
+

+
-struct  _DMXConfigParam +

References _DMXConfigWall::displayDim, dmxConfigAlloc(), _DMXConfigWall::end, _DMXConfigWall::height, _DMXConfigWall::nameList, _DMXConfigWall::start, _DMXConfigWall::wallDim, _DMXConfigWall::width, _DMXConfigPair::x, _DMXConfigWall::xwall, _DMXConfigPair::y, and _DMXConfigWall::ywall.

-struct  _DMXConfigPartDim +
+ + +
+
+ + + + + + + + + +
DMXConfigEntryPtr dmxConfigEntryComment (DMXConfigCommentPtr  comment ) 
+
+
-struct  _DMXConfigString +

References dmxConfigComment, and dmxConfigCreateEntry().

-struct  _DMXConfigSub +
+
+ +
+
+ + + + + + + + + +
DMXConfigEntryPtr dmxConfigEntryVirtual (DMXConfigVirtualPtr  virtual ) 
+
+
-struct  _DMXConfigToken +

References dmxConfigCreateEntry(), and dmxConfigVirtual.

-struct  _DMXConfigVirtual +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFree (void *  area ) 
+
+
-struct  _DMXConfigWall +

Referenced by dmxConfigFreeComment(), dmxConfigFreeDisplay(), dmxConfigFreeEntry(), dmxConfigFreeFullDim(), dmxConfigFreeNumber(), dmxConfigFreeOption(), dmxConfigFreePair(), dmxConfigFreeParam(), dmxConfigFreePartDim(), dmxConfigFreeString(), dmxConfigFreeSub(), dmxConfigFreeToken(), dmxConfigFreeVirtual(), dmxConfigFreeWall(), and dmxConfigPopState().

-

Typedefs

-typedef _DMXConfigToken DMXConfigToken +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeComment (DMXConfigCommentPtr  p ) 
+
+
-typedef _DMXConfigToken * DMXConfigTokenPtr +

References _DMXConfigComment::comment, and dmxConfigFree().

-typedef _DMXConfigString DMXConfigString +

Referenced by dmxConfigFreeEntry(), and dmxConfigFreeSub().

-typedef _DMXConfigString * DMXConfigStringPtr +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeDisplay (DMXConfigDisplayPtr  p ) 
+
+
-typedef _DMXConfigNumber DMXConfigNumber +

References _DMXConfigDisplay::dim, dmxConfigFree(), dmxConfigFreeFullDim(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigDisplay::dname, _DMXConfigDisplay::end, and _DMXConfigDisplay::start.

-typedef _DMXConfigNumber * DMXConfigNumberPtr +

Referenced by dmxConfigDDCallback(), and dmxConfigFreeSub().

-typedef _DMXConfigPair DMXConfigPair +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeEntry (DMXConfigEntryPtr  entry ) 
+
+
-typedef _DMXConfigPair * DMXConfigPairPtr +

References _DMXConfigEntry::comment, dmxConfigComment, dmxConfigFree(), dmxConfigFreeComment(), dmxConfigFreeVirtual(), dmxConfigLog(), dmxConfigVirtual, _DMXConfigEntry::next, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

-typedef _DMXConfigComment DMXConfigComment +

Referenced by dmxConfigConfigure().

-typedef _DMXConfigComment * DMXConfigCommentPtr +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeFullDim (DMXConfigFullDimPtr  p ) 
+
+
-typedef _DMXConfigPartDim DMXConfigPartDim +

References dmxConfigFree(), dmxConfigFreePartDim(), _DMXConfigFullDim::root, and _DMXConfigFullDim::scrn.

-typedef _DMXConfigPartDim * DMXConfigPartDimPtr +

Referenced by dmxConfigFreeDisplay().

-typedef _DMXConfigFullDim DMXConfigFullDim +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeNumber (DMXConfigNumberPtr  p ) 
+
+
-typedef _DMXConfigFullDim * DMXConfigFullDimPtr +

References _DMXConfigNumber::comment, and dmxConfigFree().

-typedef _DMXConfigDisplay DMXConfigDisplay +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeOption (DMXConfigOptionPtr  p ) 
+
+
-typedef _DMXConfigDisplay * DMXConfigDisplayPtr +

References dmxConfigFree(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigOption::end, _DMXConfigOption::option, _DMXConfigOption::start, and _DMXConfigOption::string.

-typedef _DMXConfigWall DMXConfigWall +

Referenced by dmxConfigFreeSub().

-typedef _DMXConfigWall * DMXConfigWallPtr +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreePair (DMXConfigPairPtr  p ) 
+
+
-typedef _DMXConfigOption DMXConfigOption +

References _DMXConfigPair::comment, and dmxConfigFree().

-typedef _DMXConfigOption * DMXConfigOptionPtr +

Referenced by dmxConfigFreePartDim(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

-typedef _DMXConfigParam DMXConfigParam +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeParam (DMXConfigParamPtr  p ) 
+
+
-typedef _DMXConfigParam * DMXConfigParamPtr +

References _DMXConfigParam::argv, _DMXConfigParam::close, dmxConfigFree(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigParam::end, _DMXConfigParam::next, _DMXConfigParam::open, _DMXConfigParam::param, and _DMXConfigParam::start.

-typedef _DMXConfigSub DMXConfigSub +

Referenced by dmxConfigFreeSub().

-typedef _DMXConfigSub * DMXConfigSubPtr +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreePartDim (DMXConfigPartDimPtr  p ) 
+
+
-typedef _DMXConfigVirtual DMXConfigVirtual +

References _DMXConfigPartDim::dim, dmxConfigFree(), dmxConfigFreePair(), and _DMXConfigPartDim::offset.

-typedef _DMXConfigVirtual * DMXConfigVirtualPtr +

Referenced by dmxConfigFreeFullDim().

-typedef _DMXConfigEntry DMXConfigEntry +
+
+ +
+
+ + + + + + + + + +
void dmxConfigFreeString (DMXConfigStringPtr  p ) 
+
+
-typedef _DMXConfigEntry * DMXConfigEntryPtr +

References _DMXConfigString::comment, dmxConfigFree(), _DMXConfigString::next, and _DMXConfigString::string.

-

Functions

-void dmxConfigLog (const char *format,...) +

Referenced by dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

- -

Detailed Description

-Interface to DMX configuration file parser.
See also:
dmxparse.c
-

Typedef Documentation

-

- - - - -
- - -
typedef struct _DMXConfigComment DMXConfigComment -
-
- - - - - -
-   - - -

-Stores parsed comments not stored with a token.

-

- - - - -
- - -
typedef struct _DMXConfigComment * DMXConfigCommentPtr -
-
- - - - - -
-   - - -

-Stores parsed comments not stored with a token.

-

- - - - -
- - -
typedef struct _DMXConfigDisplay DMXConfigDisplay -
-
- - - - - -
-   - - -

-Stores parsed display information.

-

- - - - -
- - -
typedef struct _DMXConfigDisplay * DMXConfigDisplayPtr -
-
- - - - - -
-   - - -

-Stores parsed display information.

-

- - - - -
- - -
typedef struct _DMXConfigEntry DMXConfigEntry -
-
- - - - - -
-   - - -

-Heads entry storage.

-

- - - - -
- - -
typedef struct _DMXConfigEntry * DMXConfigEntryPtr -
-
- - - - - -
-   - - -

-Heads entry storage.

-

- - - - -
- - -
typedef struct _DMXConfigFullDim DMXConfigFullDim -
-
- - - - - -
-   - - -

-Stores a pair of geometry specifications.

-

- - - - -
- - -
typedef struct _DMXConfigFullDim * DMXConfigFullDimPtr -
-
- - - - - -
-   - - -

-Stores a pair of geometry specifications.

-

- - - - -
- + + + +
+
+
- + + + + + +
typedef struct _DMXConfigNumber DMXConfigNumber + void dmxConfigFreeSub (DMXConfigSubPtr  sub ) 
-
- - - - - -
-   - - -

-Stores parsed numbers.

-

- - - - -
- + +
+ +

References _DMXConfigSub::comment, _DMXConfigSub::display, dmxConfigComment, dmxConfigDisplay, dmxConfigFree(), dmxConfigFreeComment(), dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeWall(), dmxConfigLog(), dmxConfigOption, dmxConfigParam, dmxConfigWall, _DMXConfigSub::next, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigSub::type, and _DMXConfigSub::wall.

+ +

Referenced by dmxConfigFreeVirtual().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigNumber * DMXConfigNumberPtr + void dmxConfigFreeToken (DMXConfigTokenPtr  p ) 
-
- - - - - -
-   - - -

-Stores parsed numbers.

-

- - - - -
- + +
+ +

References _DMXConfigToken::comment, and dmxConfigFree().

+ +

Referenced by dmxConfigFreeDisplay(), dmxConfigFreeOption(), dmxConfigFreeParam(), dmxConfigFreeVirtual(), and dmxConfigFreeWall().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigOption DMXConfigOption + void dmxConfigFreeVirtual (DMXConfigVirtualPtr  virtual ) 
-
- - - - - -
-   - - -

-Stores parsed option information.

-

- - - - -
- + +
+ +

References dmxConfigFree(), dmxConfigFreePair(), dmxConfigFreeString(), dmxConfigFreeSub(), and dmxConfigFreeToken().

+ +

Referenced by dmxConfigDCCallback(), and dmxConfigFreeEntry().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigOption * DMXConfigOptionPtr + void dmxConfigFreeWall (DMXConfigWallPtr  p ) 
-
- - - - - -
-   - - -

-Stores parsed option information.

-

- - - - -
- + +
+ +

References _DMXConfigWall::displayDim, dmxConfigFree(), dmxConfigFreePair(), dmxConfigFreeString(), dmxConfigFreeToken(), _DMXConfigWall::end, _DMXConfigWall::nameList, _DMXConfigWall::start, and _DMXConfigWall::wallDim.

+ +

Referenced by dmxConfigFreeSub().

+ +
+ + +
+
+
-
typedef struct _DMXConfigPair DMXConfigPair -
-
- - - - - -
-   - - -

-Stores parsed pairs (e.g., x y)

-

- - - - -
- + + + + + -
void dmxConfigLog (const char *  format,
typedef struct _DMXConfigPair * DMXConfigPairPtr -
-
- - - - - -
-   - - -

-Stores parsed pairs (e.g., x y)

-

- - - - -
- + + + + + - + + +
  ... 
typedef struct _DMXConfigParam DMXConfigParam + )
-
- - - - - -
-   - - -

-Stores parsed param information.

-

- - - - -
- + +
+

A general error logging routine that does not depend on the dmxLog functions.

+ +

Referenced by dmxConfigAlloc(), dmxConfigCreateEntry(), dmxConfigCreateSub(), dmxConfigFreeEntry(), dmxConfigFreeSub(), dmxConfigPopState(), dmxConfigPrint(), dmxConfigPrintParam(), dmxConfigPrintSub(), dmxConfigPrintTokenFlag(), and dmxConfigRealloc().

+ +
+ + +
+
+
-
typedef struct _DMXConfigParam * DMXConfigParamPtr -
-
- - - - - -
-   - - -

-Stores parsed param information.

-

- - - - -
- + + + + + -
const char** dmxConfigLookupParam (DMXConfigParamPtr  p,
typedef struct _DMXConfigPartDim DMXConfigPartDim -
-
- - - - - -
-   - - -

-Stores a geometry specification.

-

- - - - -
- + + + + + -
const char *  key,
typedef struct _DMXConfigPartDim * DMXConfigPartDimPtr -
-
- - - - - -
-   - - -

-Stores a geometry specification.

-

- - - - -
- + + + + + - + + +
int *  argc 
typedef struct _DMXConfigString DMXConfigString + )
-
- - - - - -
-   - - -

-Stores parsed strings.

-

- - - - -
- + +
+ +

References _DMXConfigParam::argc, _DMXConfigParam::argv, and _DMXConfigParam::next.

+ +

Referenced by dmxConfigCopyFromParam().

+ +
+ + +
+
+
-
typedef struct _DMXConfigString * DMXConfigStringPtr -
-
- - - - - -
-   - - -

-Stores parsed strings.

-

- - - - -
- + + + + + -
void* dmxConfigRealloc (void *  orig,
typedef struct _DMXConfigSub DMXConfigSub -
-
- - - - - -
-   - - -

-Stores options under an entry (subentry).

-

- - - - -
- + + + + + -
unsigned long  orig_bytes,
typedef struct _DMXConfigSub * DMXConfigSubPtr -
-
- - - - - -
-   - - -

-Stores options under an entry (subentry).

-

- - - - -
- + + + + + - + + +
unsigned long  bytes 
typedef struct _DMXConfigToken DMXConfigToken + )
-
- - - - - -
-   - - -

-Stores tokens not stored in other structures (e.g., keywords and ;)

-

- - - - -
- + +
+ +

References dmxConfigLog().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigToken * DMXConfigTokenPtr + DMXConfigSubPtr dmxConfigSubComment (DMXConfigCommentPtr  comment ) 
-
- - - - - -
-   - - -

-Stores tokens not stored in other structures (e.g., keywords and ;)

-

- - - - -
- + +
+ +

References dmxConfigComment, and dmxConfigCreateSub().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigVirtual DMXConfigVirtual + DMXConfigSubPtr dmxConfigSubDisplay (DMXConfigDisplayPtr  display ) 
-
- - - - - -
-   - - -

-Stores parsed virtual information.

-

- - - - -
- + +
+ +

References dmxConfigCreateSub(), and dmxConfigDisplay.

+ +

Referenced by dmxConfigNDCallback(), and dmxVDLRead().

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigVirtual * DMXConfigVirtualPtr + DMXConfigSubPtr dmxConfigSubOption (DMXConfigOptionPtr  option ) 
-
- - - - - -
-   - - -

-Stores parsed virtual information.

-

- - - - -
- + +
+ +

References dmxConfigCreateSub(), and dmxConfigOption.

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigWall DMXConfigWall + DMXConfigSubPtr dmxConfigSubParam (DMXConfigParamPtr  param ) 
-
- - - - - -
-   - - -

-Stores parsed wall information.

-

- - - - -
- + +
+ +

References dmxConfigCreateSub(), and dmxConfigParam.

+ +
+ + +
+
+
- + + + + + +
typedef struct _DMXConfigWall * DMXConfigWallPtr + DMXConfigSubPtr dmxConfigSubWall (DMXConfigWallPtr  wall ) 
-
- - - - - -
-   - - -

-Stores parsed wall information.

-

Function Documentation

-

- - - - -
- + +
+ +

References dmxConfigCreateSub(), and dmxConfigWall.

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxConfigLog ( const char *  format, void yyerror (const char *  message ) 
+ +
+ +
+ + +
+
+ + + + + + - - - +
int yylex (void  )  ... 
+
+
+ +
+
+

Variable Documentation

+ +
+
+ - - - + +
) DMXConfigEntryPtr dmxConfigEntry
+
+
+ +

Referenced by main().

+
+
+ +
+
+ + + +
int yydebug
-
- - - - - -
-   - - -

-A general error logging routine that does not depend on the dmxLog functions.

+

+
+ +

Referenced by dmxConfigReadFile(), and main().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html new file mode 100644 index 000000000..95c1086a5 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html @@ -0,0 +1,316 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8c.html b/xorg-server/hw/dmx/doc/html/dmxpict_8c.html index 96fd4fe5f..c0f256484 100644 --- a/xorg-server/hw/dmx/doc/html/dmxpict_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxpict_8c.html @@ -6,1170 +6,1393 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxpict.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxpict.h"
-#include "dmxwindow.h"
-#include "dmxpixmap.h"
-#include "fb.h"
-#include "pixmapstr.h"
-#include "dixstruct.h"
-#include "render.h"
-#include "renderproto.h"
-#include "picture.h"
-#include "picturestr.h"
-#include "mipict.h"
-#include "fbpict.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxpict.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxpict.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+#include "fb.h"
+#include "pixmapstr.h"
+#include "dixstruct.h"
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/extensions/Xfixes.h>
+#include "picture.h"
+#include "picturestr.h"
+#include "mipict.h"
+#include "fbpict.h"
+

Functions

void dmxInitRender (void)
void dmxResetRender (void)
Bool dmxPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
Bool dmxBEFreeGlyphSet (ScreenPtr pScreen, GlyphSetPtr glyphSet)
void dmxCreatePictureList (WindowPtr pWindow)
int dmxCreatePicture (PicturePtr pPicture)
Bool dmxBEFreePicture (PicturePtr pPicture)
Bool dmxDestroyPictureList (WindowPtr pWindow)
void dmxDestroyPicture (PicturePtr pPicture)
int dmxChangePictureClip (PicturePtr pPicture, int clipType, pointer value, int n)
void dmxDestroyPictureClip (PicturePtr pPicture)
void dmxChangePicture (PicturePtr pPicture, Mask mask)
void dmxValidatePicture (PicturePtr pPicture, Mask mask)
void dmxComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
void dmxGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)
void dmxCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)
Bool dmxInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Functions

static int dmxProcRenderCreateGlyphSet (ClientPtr client)
static int dmxProcRenderFreeGlyphSet (ClientPtr client)
static int dmxProcRenderAddGlyphs (ClientPtr client)
static int dmxProcRenderFreeGlyphs (ClientPtr client)
static int dmxProcRenderCompositeGlyphs (ClientPtr client)
static int dmxProcRenderSetPictureTransform (ClientPtr client)
static int dmxProcRenderSetPictureFilter (ClientPtr client)
static int dmxGlyphErrorHandler (Display *dpy, XErrorEvent *ev)
void dmxInitRender (void)
void dmxResetRender (void)
Bool dmxPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
static XRenderPictFormat * dmxFindFormat (DMXScreenInfo *dmxScreen, PictFormatPtr pFmt)
Bool dmxBEFreeGlyphSet (ScreenPtr pScreen, GlyphSetPtr glyphSet)
int dmxBECreateGlyphSet (int idx, GlyphSetPtr glyphSet)
static Picture dmxDoCreatePicture (PicturePtr pPicture)
void dmxCreatePictureList (WindowPtr pWindow)
int dmxBECreatePicture (PicturePtr pPicture)
int dmxCreatePicture (PicturePtr pPicture)
Bool dmxBEFreePicture (PicturePtr pPicture)
Bool dmxDestroyPictureList (WindowPtr pWindow)
void dmxDestroyPicture (PicturePtr pPicture)
int dmxChangePictureClip (PicturePtr pPicture, int clipType, pointer value, int n)
void dmxDestroyPictureClip (PicturePtr pPicture)
void dmxChangePicture (PicturePtr pPicture, Mask mask)
void dmxValidatePicture (PicturePtr pPicture, Mask mask)
void dmxComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
void dmxGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)
void dmxCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)
Bool dmxInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)
void dmxTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)
void dmxTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)
void dmxTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)
void dmxTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)

Variables

int RenderErrBase
int(* ProcRenderVector [RenderNumberRequests])(ClientPtr)
static int(* dmxSaveRenderVector [RenderNumberRequests])(ClientPtr)
static int dmxGlyphLastError
+

Detailed Description

+

Provide support for the RENDER extension (version 0.8).

+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
int dmxBECreateGlyphSet (int  idx,
GlyphSetPtr  glyphSet 
)
+
+
+

Create glyphSet on the backend screen number idx.

-void dmxUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef) +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxFindFormat(), dmxGlyphErrorHandler(), dmxGlyphLastError, dmxScreens, and _dmxGlyphPriv::glyphSets.

-void dmxTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps) +

Referenced by dmxBERestoreRenderGlyph(), and dmxProcRenderCreateGlyphSet().

-void dmxTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris) +
+
+ +
+
+ + + + + + + + + +
int dmxBECreatePicture (PicturePtr  pPicture ) 
+
+
+

Create pPicture on the backend.

-void dmxTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points) +

References DMX_GET_PICT_PRIV, dmxDoCreatePicture(), dmxValidatePicture(), and _dmxPictPriv::pict.

-void dmxTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points) +

Referenced by dmxBERestoreRenderPict().

- -

Detailed Description

-Provide support for the RENDER extension (version 0.8).

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxBEFreeGlyphSet ( ScreenPtr  pScreen, Bool dmxBEFreeGlyphSet (ScreenPtr  pScreen,
GlyphSetPtr  glyphSetGlyphSetPtr  glyphSet 
) )
-
- - - - - -
-   - - -

-Free glyphSet on back-end screen number idx.

-

- - - - -
- + +
+

Free glyphSet on back-end screen number idx.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxScreens, and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxBECreateResources(), dmxBEDestroyResources(), dmxProcRenderCreateGlyphSet(), and dmxProcRenderFreeGlyphSet().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreePicture ( PicturePtr  pPicture  ) Bool dmxBEFreePicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy pPicture on the back-end server.

-

- - - - -
- + +
+

Destroy pPicture on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, dmxScreens, and _dmxPictPriv::pict.

+ +

Referenced by dmxBEDestroyResources(), dmxDestroyPicture(), and dmxDestroyPictureList().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangePicture ( PicturePtr  pPicture, void dmxChangePicture (PicturePtr  pPicture,
Mask  maskMask  mask 
) )
-
- - - - - -
-   - - -

-Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.

-

- - - - -
- + +
+

Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.

+ +

References DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangePicture(), dmxScreens, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxChangePicture(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
int dmxChangePictureClip ( PicturePtr  pPicture, int dmxChangePictureClip (PicturePtr  pPicture,
int  clipType, int  clipType,
pointer  value, pointer  value,
int  nint  n 
) )
-
- - - - - -
-   - - -

-Change the picture's list of clip rectangles.

-

- - - - -
- + +
+

Change the picture's list of clip rectangles.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangePictureClip(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxChangePictureClip(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCloseIndexed ( ScreenPtr  pScreen, void dmxCloseIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormatPictFormatPtr  pFormat 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxComposite ( CARD8  op, void dmxComposite (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pMask, PicturePtr  pMask,
PicturePtr  pDst, PicturePtr  pDst,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
INT16  xMask, INT16  xMask,
INT16  yMask, INT16  yMask,
INT16  xDst, INT16  xDst,
INT16  yDst, INT16  yDst,
CARD16  width, CARD16  width,
CARD16  heightCARD16  height 
) )
-
- - - - - -
-   - - -

-Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxComposite(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxComposite(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxCompositeRects ( CARD8  op, void dmxCompositeRects (CARD8  op,
PicturePtr  pDst, PicturePtr  pDst,
xRenderColor *  color, xRenderColor *  color,
int  nRect, int  nRect,
xRectangle *  rectsxRectangle *  rects 
) )
-
- - - - - -
-   - - -

-Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCompositeRects(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxCompositeRects(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCreatePicture ( PicturePtr  pPicture  ) int dmxCreatePicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.

-

- - - - -
- + +
+

Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.

+ +

References DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCreatePicture(), dmxDoCreatePicture(), dmxScreens, _dmxPictPriv::pict, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxCreatePicture(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCreatePictureList ( WindowPtr  pWindow  ) void dmxCreatePictureList (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Create a list of pictures. This function is called by dmxCreateAndRealizeWindow() during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.

-

- - - - -
- + +
+

Create a list of pictures. This function is called by dmxCreateAndRealizeWindow() during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.

+ +

References DMX_GET_PICT_PRIV, dmxDoCreatePicture(), and _dmxPictPriv::pict.

+ +

Referenced by dmxCreateAndRealizeWindow().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyPicture ( PicturePtr  pPicture  ) void dmxDestroyPicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.

-

- - - - -
- + +
+

Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.

+ +

References DMX_UNWRAP, DMX_WRAP, dmxBEFreePicture(), dmxDestroyPicture(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyPicture(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyPictureClip ( PicturePtr  pPicture  ) void dmxDestroyPictureClip (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy the picture's list of clip rectangles.

-

- - - - -
- + +
+

Destroy the picture's list of clip rectangles.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxDestroyPictureClip(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxDestroyPictureClip(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
Bool dmxDestroyPictureList ( WindowPtr  pWindow  ) Bool dmxDestroyPictureList (WindowPtr  pWindow ) 
+ +
+

Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by dmxDestroyWindow().

+ +

References dmxBEFreePicture().

+

Referenced by dmxDestroyWindow().

+ +
+ + +
+
+ + + + + + + + +
static Picture dmxDoCreatePicture (PicturePtr  pPicture )  [static]
-
- - - - - -
-   - - -

-Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by dmxDestroyWindow().

-

- - - - -
- + +
+

Create a picture on the appropriate screen. This is the actual function that creates the picture. However, if the associated window has not yet been created due to lazy window creation, then delay the picture creation until the window is mapped.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, DMX_GET_WINDOW_PRIV, dmxFindFormat(), dmxScreens, _dmxWinPriv::hasPict, _dmxPixPriv::pixmap, and _dmxWinPriv::window.

+ +

Referenced by dmxBECreatePicture(), dmxCreatePicture(), and dmxCreatePictureList().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - - + + + +
void dmxGlyphs ( CARD8  op, static XRenderPictFormat* dmxFindFormat (DMXScreenInfo *  dmxScreen,
PicturePtr  pSrc, PictFormatPtr  pFmt 
PicturePtr  pDst, ) [static]
+ +
+

Find the appropriate format on the requested screen given the internal format requested. The list of formats is searched sequentially as the XRenderFindFormat() function does not always find the appropriate format when a specific format is requested.

+ +

References _DMXScreenInfo::beDisplay.

+ +

Referenced by dmxBECreateGlyphSet(), dmxDoCreatePicture(), dmxProcRenderCompositeGlyphs(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), and dmxTriStrip().

+ +
+ + +
+
+ + + + + + + - - - + + - - - + + + +
static int dmxGlyphErrorHandler (Display *  dpy,
PictFormatPtr  maskFormat, XErrorEvent *  ev 
INT16  xSrc, ) [static]
+
+
+ +

References dmxGlyphLastError.

+ +

Referenced by dmxBECreateGlyphSet().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + - - + + -
void dmxGlyphs (CARD8  op,
PicturePtr  pSrc,
INT16  ySrc, PicturePtr  pDst,
PictFormatPtr  maskFormat,
int  nlists, INT16  xSrc,
INT16  ySrc,
GlyphListPtr  lists, int  nlists,
GlyphListPtr  lists,
GlyphPtr *  glyphsGlyphPtr *  glyphs 
) )
-
- - - - - -
-   - - -

-Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by dmxProcRenderCompositeGlyphs(). This function should never be called.

-

- - - - -
- + +
+

Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by dmxProcRenderCompositeGlyphs(). This function should never be called.

+ +

Referenced by dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxInitIndexed ( ScreenPtr  pScreen, Bool dmxInitIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormatPictFormatPtr  pFormat 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxInitRender ( void   ) void dmxInitRender (void  ) 
-
- - - - - -
-   - - -

-Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from InitOutput() since it should be initialized only once per server generation.

-

- - - - -
- + +
+

Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from InitOutput() since it should be initialized only once per server generation.

+ +

References dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxSaveRenderVector, and ProcRenderVector.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + +
Bool dmxPictureInit ( ScreenPtr  pScreen, Bool dmxPictureInit (ScreenPtr  pScreen,
PictFormatPtr  formats, PictFormatPtr  formats,
int  nformatsint  nformats 
) )
+ +
+

Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.

+ +

References DMX_WRAP, dmxChangePicture(), dmxChangePictureClip(), dmxComposite(), dmxCompositeRects(), dmxCreatePicture(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxGlyphs(), dmxPictPrivateKey, dmxScreens, dmxShadowFB, dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), and dmxValidatePicture().

+

Referenced by dmxScreenInit().

+ +
+ + +
+
+ + + + + + + + +
static int dmxProcRenderAddGlyphs (ClientPtr  client )  [static]
-
- - - - - -
-   - - -

-Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.

-

- - - - -
- + +
+

Add glyphs to the Glyph Set on each screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxNumScreens, dmxSaveRenderVector, dmxScreens, dmxSync(), and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxInitRender().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxResetRender ( void   ) static int dmxProcRenderCompositeGlyphs (ClientPtr  client )  [static]
+ +
+

Composite glyphs on each screen into the requested picture. If either the src or dest picture has not been allocated due to lazy window creation, this request will gracefully return.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, DMX_GET_PICT_PRIV, dmxFindFormat(), dmxSaveRenderVector, dmxScreens, dmxSync(), _dmxGlyphPriv::glyphSets, and _dmxPictPriv::pict.

+

Referenced by dmxInitRender().

+ +
+ + +
+
+ + + + + + + + +
static int dmxProcRenderCreateGlyphSet (ClientPtr  client )  [static]
-
- - - - - -
-   - - -

-Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from dmxCloseScreen() during the server reset (only for screen #0).

-

- - - - -
- + +
+

Create a Glyph Set on each screen. Save the glyphset ID from each screen in the Glyph Set's private structure. Fail if the format requested is not available or if the Glyph Set cannot be created on the screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_SET_GLYPH_PRIV, dmxBECreateGlyphSet(), dmxBEFreeGlyphSet(), dmxNumScreens, dmxSaveRenderVector, dmxScreens, and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxInitRender().

+ +
+ + +
+
+
- - - - + + + + + + +
void dmxTrapezoids ( CARD8  op, static int dmxProcRenderFreeGlyphs (ClientPtr  client )  [static]
+ +
+

Free glyphs from the Glyph Set for each screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxNumScreens, dmxSaveRenderVector, dmxScreens, dmxSync(), and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxInitRender().

+ +
+ + +
+
+ - - - - + + + + + + +
PicturePtr  pSrc, static int dmxProcRenderFreeGlyphSet (ClientPtr  client )  [static]
+
+
+

Free the previously allocated Glyph Sets for each screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, DMX_SET_GLYPH_PRIV, dmxBEFreeGlyphSet(), dmxNumScreens, dmxSaveRenderVector, dmxScreens, dmxSync(), and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxInitRender().

+ +
+
+ +
+
+ - - - - + + + + + + +
PicturePtr  pDst, static int dmxProcRenderSetPictureFilter (ClientPtr  client )  [static]
+
+
+

Set the picture filter on each screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, dmxSaveRenderVector, dmxScreens, dmxSync(), _dmxPictPriv::pict, and RenderErrBase.

+ +

Referenced by dmxInitRender().

+ +
+
+ +
+
+ - - - - + + + + + + +
PictFormatPtr  maskFormat, static int dmxProcRenderSetPictureTransform (ClientPtr  client )  [static]
+
+
+

Set the picture transform on each screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, dmxSaveRenderVector, dmxScreens, dmxSync(), _dmxPictPriv::pict, and RenderErrBase.

+ +

Referenced by dmxInitRender().

+ +
+
+ +
+
+ + + + + + + +
void dmxResetRender (void  ) 
+
+
+

Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from dmxCloseScreen() during the server reset (only for screen #0).

+ +

References dmxSaveRenderVector, and ProcRenderVector.

+ +

Referenced by dmxCloseScreen().

+ +
+
+ +
+
+ + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + - - + + -
void dmxTrapezoids (CARD8  op,
INT16  xSrc, PicturePtr  pSrc,
PicturePtr  pDst,
INT16  ySrc, PictFormatPtr  maskFormat,
INT16  xSrc,
int  ntrap, INT16  ySrc,
int  ntrap,
xTrapezoid *  trapsxTrapezoid *  traps 
) )
-
- - - - - -
-   - - -

-Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTrapezoids(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTrapezoids().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriangles ( CARD8  op, void dmxTriangles (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  ntri, int  ntri,
xTriangle *  trisxTriangle *  tris 
) )
-
- - - - - -
-   - - -

-Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriangles(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriangles().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriFan ( CARD8  op, void dmxTriFan (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  npoint, int  npoint,
xPointFixed *  pointsxPointFixed *  points 
) )
-
- - - - - -
-   - - -

-Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriFan(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriFan().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriStrip ( CARD8  op, void dmxTriStrip (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  npoint, int  npoint,
xPointFixed *  pointsxPointFixed *  points 
) )
-
- - - - - -
-   - - -

-Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriStrip(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriStrip().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxUpdateIndexed ( ScreenPtr  pScreen, void dmxUpdateIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormat, PictFormatPtr  pFormat,
int  ndef, int  ndef,
xColorItem *  pdefxColorItem *  pdef 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + + +
void dmxValidatePicture ( PicturePtr  pPicture, void dmxValidatePicture (PicturePtr  pPicture,
Mask  maskMask  mask 
) )
+ +
+

Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxSync(), dmxValidatePicture(), _dmxPictPriv::pict, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxBECreatePicture(), dmxPictureInit(), and dmxValidatePicture().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
int dmxGlyphLastError [static]
+
+
+

Catch errors that might occur when allocating Glyph Sets. Errors are saved in dmxGlyphLastError for later handling.

+ +

Referenced by dmxBECreateGlyphSet(), and dmxGlyphErrorHandler().

+
+
+ +
+
+ + + +
int(* dmxSaveRenderVector[RenderNumberRequests])(ClientPtr) [static]
-
- - - - - -
-   - - -

-Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.

+

+
+ +

Referenced by dmxInitRender(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), and dmxResetRender().

+ +
+
+ +
+
+ + + + +
int(* ProcRenderVector[RenderNumberRequests])(ClientPtr)
+
+
+ +

Referenced by dmxInitRender(), and dmxResetRender().

+ +
+
+ +
+
+ + + + +
int RenderErrBase
+
+
+ +

Referenced by dmxProcRenderSetPictureFilter(), and dmxProcRenderSetPictureTransform().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html deleted file mode 100644 index 1043f82bf..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxpict.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00042 #ifndef DMXPICT_H
-00043 #define DMXPICT_H
-00044 
-00046 typedef struct _dmxPictPriv {
-00047     Picture  pict;              
-00048     Mask     savedMask;         
-00050 } dmxPictPrivRec, *dmxPictPrivPtr;
-00051 
-00052 
-00054 typedef struct _dmxGlyphPriv {
-00055     GlyphSet  *glyphSets; 
-00056 } dmxGlyphPrivRec, *dmxGlyphPrivPtr;
-00057 
-00058 
-00059 extern void dmxInitRender(void);
-00060 extern void dmxResetRender(void);
-00061 
-00062 extern Bool dmxPictureInit(ScreenPtr pScreen,
-00063                            PictFormatPtr formats, int nformats);
-00064 
-00065 extern void dmxCreatePictureList(WindowPtr pWindow);
-00066 extern Bool dmxDestroyPictureList(WindowPtr pWindow);
-00067 
-00068 extern int dmxCreatePicture(PicturePtr pPicture);
-00069 extern void dmxDestroyPicture(PicturePtr pPicture);
-00070 extern int dmxChangePictureClip(PicturePtr pPicture, int clipType,
-00071                                 pointer value, int n);
-00072 extern void dmxDestroyPictureClip(PicturePtr pPicture);
-00073 extern void dmxChangePicture(PicturePtr pPicture, Mask mask);
-00074 extern void dmxValidatePicture(PicturePtr pPicture, Mask mask);
-00075 extern void dmxComposite(CARD8 op,
-00076                          PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
-00077                          INT16 xSrc, INT16 ySrc,
-00078                          INT16 xMask, INT16 yMask,
-00079                          INT16 xDst, INT16 yDst,
-00080                          CARD16 width, CARD16 height);
-00081 extern void dmxGlyphs(CARD8 op,
-00082                       PicturePtr pSrc, PicturePtr pDst,
-00083                       PictFormatPtr maskFormat,
-00084                       INT16 xSrc, INT16 ySrc,
-00085                       int nlists, GlyphListPtr lists, GlyphPtr *glyphs);
-00086 extern void dmxCompositeRects(CARD8 op,
-00087                               PicturePtr pDst,
-00088                               xRenderColor *color,
-00089                               int nRect, xRectangle *rects);
-00090 extern Bool dmxInitIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);
-00091 extern void dmxCloseIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);
-00092 extern void dmxUpdateIndexed(ScreenPtr pScreen, PictFormatPtr pFormat,
-00093                              int ndef, xColorItem *pdef);
-00094 extern void dmxTrapezoids(CARD8 op,
-00095                           PicturePtr pSrc, PicturePtr pDst,
-00096                           PictFormatPtr maskFormat,
-00097                           INT16 xSrc, INT16 ySrc,
-00098                           int ntrap, xTrapezoid *traps);
-00099 extern void dmxTriangles(CARD8 op,
-00100                          PicturePtr pSrc, PicturePtr pDst,
-00101                          PictFormatPtr maskFormat,
-00102                          INT16 xSrc, INT16 ySrc,
-00103                          int ntri, xTriangle *tris);
-00104 extern void dmxTriStrip(CARD8 op,
-00105                         PicturePtr pSrc, PicturePtr pDst,
-00106                         PictFormatPtr maskFormat,
-00107                         INT16 xSrc, INT16 ySrc,
-00108                         int npoint, xPointFixed *points);
-00109 extern void dmxTriFan(CARD8 op,
-00110                       PicturePtr pSrc, PicturePtr pDst,
-00111                       PictFormatPtr maskFormat,
-00112                       INT16 xSrc, INT16 ySrc,
-00113                       int npoint, xPointFixed *points);
-00114 
-00115 extern Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet);
-00116 extern Bool dmxBEFreePicture(PicturePtr pPicture);
-00117 
-00118 extern int dmxPictPrivateIndex;         
-00119 extern int dmxGlyphSetPrivateIndex;     
-00123 #define DMX_GET_PICT_PRIV(_pPict)                                       \
-00124     (dmxPictPrivPtr)(_pPict)->devPrivates[dmxPictPrivateIndex].ptr
-00125 
-00127 #define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)                             \
-00128     GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateIndex, (_pPriv))
-00129 
-00130 #define DMX_GET_GLYPH_PRIV(_pGlyph)                                     \
-00131     (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateIndex)
-00132 
-00133 #endif /* DMXPICT_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h.html index ea00f7a84..722a89152 100644 --- a/xorg-server/hw/dmx/doc/html/dmxpict_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxpict_8h.html @@ -6,1404 +6,1229 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxpict.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  _dmxGlyphPriv
struct  _dmxPictPriv

Defines

#define DMX_GET_PICT_PRIV(_pPict)   (dmxPictPrivPtr)(_pPict)->devPrivates[dmxPictPrivateIndex].ptr
#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)   GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateIndex, (_pPriv))
#define DMX_GET_GLYPH_PRIV(_pGlyph)   (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateIndex)

Typedefs

typedef _dmxPictPriv dmxPictPrivRec
typedef _dmxPictPriv * dmxPictPrivPtr
typedef _dmxGlyphPriv dmxGlyphPrivRec
typedef _dmxGlyphPriv * dmxGlyphPrivPtr

Functions

void dmxInitRender (void)
void dmxResetRender (void)
Bool dmxPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
void dmxCreatePictureList (WindowPtr pWindow)
Bool dmxDestroyPictureList (WindowPtr pWindow)
int dmxCreatePicture (PicturePtr pPicture)
void dmxDestroyPicture (PicturePtr pPicture)
int dmxChangePictureClip (PicturePtr pPicture, int clipType, pointer value, int n)
void dmxDestroyPictureClip (PicturePtr pPicture)
void dmxChangePicture (PicturePtr pPicture, Mask mask)
void dmxValidatePicture (PicturePtr pPicture, Mask mask)
void dmxComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
void dmxGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)
void dmxCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)
Bool dmxInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)
void dmxTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)
void dmxTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)
void dmxTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)
void dmxTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)
Bool dmxBEFreeGlyphSet (ScreenPtr pScreen, GlyphSetPtr glyphSet)
Bool dmxBEFreePicture (PicturePtr pPicture)

Variables

int dmxPictPrivateIndex
int dmxGlyphSetPrivateIndex
-

Detailed Description

-This file provides access to the externally visible RENDER support functions, global variables and macros for DMX.

-FIXME: Move function definitions for non-externally visible function to .c file.

Define Documentation

-

- - - +

Referenced by dmxPropertyCheckOtherServers(), and dmxPropertyIdentifier().

-
- - - - - - - - - -
#define DMX_GET_GLYPH_PRIV( _pGlyph   )    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateIndex) +

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _dmxPictPriv
struct  _dmxGlyphPriv

Defines

#define DMX_GET_PICT_PRIV(_pPict)   (dmxPictPrivPtr)dixLookupPrivate(&(_pPict)->devPrivates, dmxPictPrivateKey)
#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)   GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))
#define DMX_GET_GLYPH_PRIV(_pGlyph)   (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)

Typedefs

typedef struct _dmxPictPriv dmxPictPrivRec
typedef struct _dmxPictPriv * dmxPictPrivPtr
typedef struct _dmxGlyphPriv dmxGlyphPrivRec
typedef struct _dmxGlyphPriv * dmxGlyphPrivPtr

Functions

void dmxInitRender (void)
void dmxResetRender (void)
Bool dmxPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
void dmxCreatePictureList (WindowPtr pWindow)
Bool dmxDestroyPictureList (WindowPtr pWindow)
int dmxCreatePicture (PicturePtr pPicture)
void dmxDestroyPicture (PicturePtr pPicture)
int dmxChangePictureClip (PicturePtr pPicture, int clipType, pointer value, int n)
void dmxDestroyPictureClip (PicturePtr pPicture)
void dmxChangePicture (PicturePtr pPicture, Mask mask)
void dmxValidatePicture (PicturePtr pPicture, Mask mask)
void dmxComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
void dmxGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)
void dmxCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)
Bool dmxInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat)
void dmxUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)
void dmxTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)
void dmxTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)
void dmxTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)
void dmxTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)
int dmxBECreateGlyphSet (int idx, GlyphSetPtr glyphSet)
Bool dmxBEFreeGlyphSet (ScreenPtr pScreen, GlyphSetPtr glyphSet)
int dmxBECreatePicture (PicturePtr pPicture)
Bool dmxBEFreePicture (PicturePtr pPicture)

Variables

DevPrivateKey dmxPictPrivateKey
DevPrivateKey dmxGlyphSetPrivateKey
+

Detailed Description

+

This file provides access to the externally visible RENDER support functions, global variables and macros for DMX.

+

FIXME: Move function definitions for non-externally visible function to .c file.

+

Define Documentation

+ +
+
+ + + + + + + + +
#define DMX_GET_GLYPH_PRIV(_pGlyph  )    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)
-
- - - - - -
-   - - -

-Get the glyphset private data given a glyphset pointer

-

- - - +

Referenced by dmxPropertyDisplay(), dmxPropertySameDisplay(), and dmxPropertyWindow().

- + + + +
+
+
- - - - - - - - - -
#define DMX_GET_PICT_PRIV( _pPict   )    (dmxPictPrivPtr)(_pPict)->devPrivates[dmxPictPrivateIndex].ptr + +
+

Get the glyphset private data given a glyphset pointer

+ +

Referenced by dmxBECreateGlyphSet(), dmxBEFreeGlyphSet(), dmxBERestoreRenderGlyph(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderFreeGlyphs(), and dmxProcRenderFreeGlyphSet().

+ +
+ + +
+
+ + + + + + + + +
#define DMX_GET_PICT_PRIV(_pPict  )    (dmxPictPrivPtr)dixLookupPrivate(&(_pPict)->devPrivates, dmxPictPrivateKey)
-
- - - - - -
-   - - -

-Get the picture private data given a picture pointer

-

- - - - -
- + +
+

Get the picture private data given a picture pointer

+ +

Referenced by dmxBECreatePicture(), dmxBEFreePicture(), dmxChangePicture(), dmxChangePictureClip(), dmxComposite(), dmxCompositeRects(), dmxCreatePicture(), dmxCreatePictureList(), dmxDestroyPictureClip(), dmxProcRenderCompositeGlyphs(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), and dmxValidatePicture().

+ +
+ + +
+
+
- - - - + + + + + + - - - - + + + +
#define DMX_SET_GLYPH_PRIV( _pGlyph,
#define DMX_SET_GLYPH_PRIV(_pGlyph,
_pPriv   )    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateIndex, (_pPriv)) + _pPriv  )    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))
-
- - - - - -
-   - - -

-Set the glyphset private data given a glyphset pointer

-

Typedef Documentation

-

- - - +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, and _dmxPixPriv::pixmap.

- +

Referenced by dmxBEDestroyResources(), dmxBEDestroyWindowTree(), dmxDestroyPixmap(), and dmxDetachScreen().

-
- - - - -
typedef struct _dmxGlyphPriv * dmxGlyphPrivPtr + +
+

Set the glyphset private data given a glyphset pointer

+ +

Referenced by dmxProcRenderCreateGlyphSet(), and dmxProcRenderFreeGlyphSet().

+ +
+ +

Typedef Documentation

+ +
+
+ + + +
typedef struct _dmxGlyphPriv * dmxGlyphPrivPtr
-
- - - - - -
-   - - -

-Glyph Set private structure

-

- - - - -
- + +
+ +
+ + +
+
+
- +
typedef struct _dmxGlyphPriv dmxGlyphPrivRec + typedef struct _dmxGlyphPriv dmxGlyphPrivRec
-
- - - - - -
-   - - -

-Glyph Set private structure

-

- - - - -
- + +
+

Glyph Set private structure

+ +
+ + +
+
+
- +
typedef struct _dmxPictPriv * dmxPictPrivPtr + typedef struct _dmxPictPriv * dmxPictPrivPtr
-
- - - - - -
-   - - -

-Picture private structure

-

- - - - -
- + +
+ +
+ + +
+
+
- +
typedef struct _dmxPictPriv dmxPictPrivRec + typedef struct _dmxPictPriv dmxPictPrivRec
-
- - - - - -
-   - - -

-Picture private structure

-

Function Documentation

-

- - - - -
- + +
+

Picture private structure

+ +
+ +

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxBEFreeGlyphSet ( ScreenPtr  pScreen, int dmxBECreateGlyphSet (int  idx,
GlyphSetPtr  glyphSetGlyphSetPtr  glyphSet 
) )
-
- - - - - -
-   - - -

-Free glyphSet on back-end screen number idx.

-

- - - - -
- + +
+

Create glyphSet on the backend screen number idx.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxFindFormat(), dmxGlyphErrorHandler(), dmxGlyphLastError, dmxScreens, and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxBERestoreRenderGlyph(), and dmxProcRenderCreateGlyphSet().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreePicture ( PicturePtr  pPicture  ) int dmxBECreatePicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy pPicture on the back-end server.

-

- - - - -
- + +
+

Create pPicture on the backend.

+ +

References DMX_GET_PICT_PRIV, dmxDoCreatePicture(), dmxValidatePicture(), and _dmxPictPriv::pict.

+ +

Referenced by dmxBERestoreRenderPict().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + +
void dmxChangePicture ( PicturePtr  pPicture, Bool dmxBEFreeGlyphSet (ScreenPtr  pScreen,
Mask  maskGlyphSetPtr  glyphSet 
) )
+ +
+

Free glyphSet on back-end screen number idx.

+

References _DMXScreenInfo::beDisplay, DMX_GET_GLYPH_PRIV, dmxScreens, and _dmxGlyphPriv::glyphSets.

+ +

Referenced by dmxBECreateResources(), dmxBEDestroyResources(), dmxProcRenderCreateGlyphSet(), and dmxProcRenderFreeGlyphSet().

+ +
+ + +
+
+ + + + + + + + +
Bool dmxBEFreePicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.

-

- - - - -
- + +
+

Destroy pPicture on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, dmxScreens, and _dmxPictPriv::pict.

+ +

Referenced by dmxBEDestroyResources(), dmxDestroyPicture(), and dmxDestroyPictureList().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + + + +
int dmxChangePictureClip ( PicturePtr  pPicture, void dmxChangePicture (PicturePtr  pPicture,
int  clipType, Mask  mask 
)
+ +
+

Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.

+ +

References DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangePicture(), dmxScreens, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxChangePicture(), and dmxPictureInit().

+ +
+ + +
+
+ + + + + + + + + - - + + + + + + + + - - + + - - + + -
int dmxChangePictureClip (PicturePtr  pPicture,
pointer  value, int  clipType,
pointer  value,
int  nint  n 
) )
-
- - - - - -
-   - - -

-Change the picture's list of clip rectangles.

-

- - - - -
- + +
+

Change the picture's list of clip rectangles.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangePictureClip(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxChangePictureClip(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCloseIndexed ( ScreenPtr  pScreen, void dmxCloseIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormatPictFormatPtr  pFormat 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxComposite ( CARD8  op, void dmxComposite (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pMask, PicturePtr  pMask,
PicturePtr  pDst, PicturePtr  pDst,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
INT16  xMask, INT16  xMask,
INT16  yMask, INT16  yMask,
INT16  xDst, INT16  xDst,
INT16  yDst, INT16  yDst,
CARD16  width, CARD16  width,
CARD16  heightCARD16  height 
) )
-
- - - - - -
-   - - -

-Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxComposite(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxComposite(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxCompositeRects ( CARD8  op, void dmxCompositeRects (CARD8  op,
PicturePtr  pDst, PicturePtr  pDst,
xRenderColor *  color, xRenderColor *  color,
int  nRect, int  nRect,
xRectangle *  rectsxRectangle *  rects 
) )
-
- - - - - -
-   - - -

-Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCompositeRects(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxCompositeRects(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
int dmxCreatePicture ( PicturePtr  pPicture  ) int dmxCreatePicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.

-

- - - - -
- + +
+

Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.

+ +

References DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCreatePicture(), dmxDoCreatePicture(), dmxScreens, _dmxPictPriv::pict, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxCreatePicture(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxCreatePictureList ( WindowPtr  pWindow  ) void dmxCreatePictureList (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Create a list of pictures. This function is called by dmxCreateAndRealizeWindow() during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.

-

- - - - -
- + +
+

Create a list of pictures. This function is called by dmxCreateAndRealizeWindow() during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.

+ +

References DMX_GET_PICT_PRIV, dmxDoCreatePicture(), and _dmxPictPriv::pict.

+ +

Referenced by dmxCreateAndRealizeWindow().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyPicture ( PicturePtr  pPicture  ) void dmxDestroyPicture (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.

-

- - - - -
- + +
+

Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.

+ +

References DMX_UNWRAP, DMX_WRAP, dmxBEFreePicture(), dmxDestroyPicture(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyPicture(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxDestroyPictureClip ( PicturePtr  pPicture  ) void dmxDestroyPictureClip (PicturePtr  pPicture ) 
-
- - - - - -
-   - - -

-Destroy the picture's list of clip rectangles.

-

- - - - -
- + +
+

Destroy the picture's list of clip rectangles.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxDestroyPictureClip(), dmxScreens, dmxSync(), and _dmxPictPriv::pict.

+ +

Referenced by dmxDestroyPictureClip(), and dmxPictureInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxDestroyPictureList ( WindowPtr  pWindow  ) Bool dmxDestroyPictureList (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by dmxDestroyWindow().

-

- - - - -
- + +
+

Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by dmxDestroyWindow().

+ +

References dmxBEFreePicture().

+ +

Referenced by dmxDestroyWindow().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxGlyphs ( CARD8  op, void dmxGlyphs (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  nlists, int  nlists,
GlyphListPtr  lists, GlyphListPtr  lists,
GlyphPtr *  glyphsGlyphPtr *  glyphs 
) )
-
- - - - - -
-   - - -

-Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by dmxProcRenderCompositeGlyphs(). This function should never be called.

-

- - - - -
- + +
+

Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by dmxProcRenderCompositeGlyphs(). This function should never be called.

+ +

Referenced by dmxPictureInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxInitIndexed ( ScreenPtr  pScreen, Bool dmxInitIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormatPictFormatPtr  pFormat 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxInitRender ( void   ) void dmxInitRender (void  ) 
-
- - - - - -
-   - - -

-Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from InitOutput() since it should be initialized only once per server generation.

-

- - - - -
- + +
+

Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from InitOutput() since it should be initialized only once per server generation.

+ +

References dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxSaveRenderVector, and ProcRenderVector.

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
Bool dmxPictureInit ( ScreenPtr  pScreen, Bool dmxPictureInit (ScreenPtr  pScreen,
PictFormatPtr  formats, PictFormatPtr  formats,
int  nformatsint  nformats 
) )
-
- - - - - -
-   - - -

-Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.

-

- - - - -
- + +
+

Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.

+ +

References DMX_WRAP, dmxChangePicture(), dmxChangePictureClip(), dmxComposite(), dmxCompositeRects(), dmxCreatePicture(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxGlyphs(), dmxPictPrivateKey, dmxScreens, dmxShadowFB, dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), and dmxValidatePicture().

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxResetRender ( void   ) void dmxResetRender (void  ) 
-
- - - - - -
-   - - -

-Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from dmxCloseScreen() during the server reset (only for screen #0).

-

- - - - -
- + +
+

Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from dmxCloseScreen() during the server reset (only for screen #0).

+ +

References dmxSaveRenderVector, and ProcRenderVector.

+ +

Referenced by dmxCloseScreen().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTrapezoids ( CARD8  op, void dmxTrapezoids (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  ntrap, int  ntrap,
xTrapezoid *  trapsxTrapezoid *  traps 
) )
-
- - - - - -
-   - - -

-Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTrapezoids(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTrapezoids().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriangles ( CARD8  op, void dmxTriangles (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  ntri, int  ntri,
xTriangle *  trisxTriangle *  tris 
) )
-
- - - - - -
-   - - -

-Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriangles(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriangles().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriFan ( CARD8  op, void dmxTriFan (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  npoint, int  npoint,
xPointFixed *  pointsxPointFixed *  points 
) )
-
- - - - - -
-   - - -

-Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriFan(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriFan().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxTriStrip ( CARD8  op, void dmxTriStrip (CARD8  op,
PicturePtr  pSrc, PicturePtr  pSrc,
PicturePtr  pDst, PicturePtr  pDst,
PictFormatPtr  maskFormat, PictFormatPtr  maskFormat,
INT16  xSrc, INT16  xSrc,
INT16  ySrc, INT16  ySrc,
int  npoint, int  npoint,
xPointFixed *  pointsxPointFixed *  points 
) )
-
- - - - - -
-   - - -

-Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.

-

- - - - -
- + +
+

Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxFindFormat(), dmxScreens, dmxSync(), dmxTriStrip(), and _dmxPictPriv::pict.

+ +

Referenced by dmxPictureInit(), and dmxTriStrip().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxUpdateIndexed ( ScreenPtr  pScreen, void dmxUpdateIndexed (ScreenPtr  pScreen,
PictFormatPtr  pFormat, PictFormatPtr  pFormat,
int  ndef, int  ndef,
xColorItem *  pdefxColorItem *  pdef 
) )
-
- - - - - -
-   - - -

-Indexed color visuals are not yet supported.

-

- - - - -
- + +
+

Indexed color visuals are not yet supported.

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxValidatePicture ( PicturePtr  pPicture, void dmxValidatePicture (PicturePtr  pPicture,
Mask  maskMask  mask 
) )
-
- - - - - -
-   - - -

-Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.

-

Variable Documentation

-

- - - +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, dmxSync(), _dmxPixPriv::pixmap, and _DMXScreenInfo::scrnWin.

- +

Referenced by dmxAttachScreen(), dmxBECreateResources(), dmxBECreateWindowTree(), dmxBERestoreRenderPict(), and dmxCreatePixmap().

- + + + +
+
+
- - - - -
int dmxGlyphSetPrivateIndex + +
+

Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_PICT_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxSync(), dmxValidatePicture(), _dmxPictPriv::pict, and _dmxPictPriv::savedMask.

+ +

Referenced by dmxBECreatePicture(), dmxPictureInit(), and dmxValidatePicture().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
DevPrivateKey dmxGlyphSetPrivateKey
-
- - - - - -
-   - - -

-Private index for GlyphSets

-

- - - - -
- + +
+

Index for glyphset private data

+

Private index for GlyphSets

+ +
+ + +
+
+
- +
int dmxPictPrivateIndex + DevPrivateKey dmxPictPrivateKey
-
- - - - - -
-   - - -

-Private index for Picts

+ +

+

Index for picture private data

+

Private index for Picts

+ +

Referenced by dmxPictureInit().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html new file mode 100644 index 000000000..7616ee671 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html @@ -0,0 +1,156 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html index 8c6fc4551..68bbc807a 100644 --- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html @@ -6,226 +6,207 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxpixmap.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxpixmap.h"
-#include "pixmapstr.h"
-#include "servermd.h"
- - - - + + +
+

dmxpixmap.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxpixmap.h"
+#include "pixmapstr.h"
+#include "servermd.h"
+#include "privates.h"
+

Functions

Bool dmxInitPixmap (ScreenPtr pScreen)
+ + + + + + + +

Functions

Bool dmxInitPixmap (ScreenPtr pScreen)
void dmxBECreatePixmap (PixmapPtr pPixmap)
PixmapPtr dmxCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)
Bool dmxBEFreePixmap (PixmapPtr pPixmap)
Bool dmxDestroyPixmap (PixmapPtr pPixmap)
RegionPtr dmxBitmapToRegion (PixmapPtr pPixmap)
+

Detailed Description

+

Provides pixmap support.

+

Function Documentation

+ +
+
+ + + + + + + + + +
void dmxBECreatePixmap (PixmapPtr  pPixmap ) 
+
+
+

Create a pixmap on the back-end server.

-
void dmxBECreatePixmap (PixmapPtr pPixmap)
PixmapPtr dmxCreatePixmap (ScreenPtr pScreen, int width, int height, int depth)
Bool dmxBEFreePixmap (PixmapPtr pPixmap)
+ + + + + + + + +
Bool dmxBEFreePixmap (PixmapPtr  pPixmap ) 
+ +

+

Destroy the pixmap on the back-end server.

-
Bool dmxDestroyPixmap (PixmapPtr pPixmap)
RegionPtr dmxBitmapToRegion (PixmapPtr pPixmap)
-

Detailed Description

-Provides pixmap support.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
void dmxBECreatePixmap ( PixmapPtr  pPixmap  ) RegionPtr dmxBitmapToRegion (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - - -

-Create a pixmap on the back-end server.

-

- - - - -
- - - - - - - - - + +
+

Create and return a region based on the pixmap pointed to by pPixmap.

-
Bool dmxBEFreePixmap ( PixmapPtr  pPixmap  ) 
-
- - - - - -
-   - - -

-Destroy the pixmap on the back-end server.

-

- - - - -
- - - - - - - - - +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, dmxSync(), and _dmxPixPriv::pixmap.

-
RegionPtr dmxBitmapToRegion ( PixmapPtr  pPixmap  ) 
-
- - - - - -
-   - - -

-Create and return a region based on the pixmap pointed to by pPixmap.

-

- - - - -
- +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + + + + + + - - + + - - + + -
PixmapPtr dmxCreatePixmap ( ScreenPtr  pScreen, PixmapPtr dmxCreatePixmap (ScreenPtr  pScreen,
int  width, int  width,
int  height, int  height,
int  depth,
int  depthunsigned  usage_hint 
) )
-
- - - - - -
-   - - -

-Create a pixmap for pScreen with the specified width, height, and depth.

-

- - - - -
- + +
+

Create a pixmap for pScreen with the specified width, height, and depth.

+ +

References _DMXScreenInfo::beDisplay, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBECreatePixmap(), dmxCreatePixmap(), dmxScreens, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxCreatePixmap(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxDestroyPixmap ( PixmapPtr  pPixmap  ) Bool dmxDestroyPixmap (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - - -

-Destroy the pixmap pointed to by pPixmap.

-

- - - - -
- + +
+

Destroy the pixmap pointed to by pPixmap.

+ +

References _DMXScreenInfo::beDisplay, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEFreePixmap(), dmxDestroyPixmap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyPixmap(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxInitPixmap ( ScreenPtr  pScreen  ) Bool dmxInitPixmap (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Initialize a private area in pScreen for pixmap information.

+ +

+

Initialize a private area in pScreen for pixmap information.

+ +

References dmxPixPrivateKey.

+ +

Referenced by dmxScreenInit().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html deleted file mode 100644 index faa74a3e0..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxpixmap.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXPIXMAP_H
-00039 #define DMXPIXMAP_H
-00040 
-00041 #include "pixmapstr.h"
-00042 
-00044 typedef struct _dmxPixPriv {
-00045     Pixmap   pixmap;
-00046     XImage  *detachedImage;
-00047 } dmxPixPrivRec, *dmxPixPrivPtr;
-00048 
-00049 
-00050 extern Bool      dmxInitPixmap(ScreenPtr pScreen);
-00051 
-00052 extern PixmapPtr dmxCreatePixmap(ScreenPtr pScreen,
-00053                                  int width, int height, int depth);
-00054 extern Bool      dmxDestroyPixmap(PixmapPtr pPixmap);
-00055 extern RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap);
-00056 
-00057 extern void      dmxBECreatePixmap(PixmapPtr pPixmap);
-00058 extern Bool      dmxBEFreePixmap(PixmapPtr pPixmap);
-00059 
-00061 extern int dmxPixPrivateIndex;
-00062 
-00064 #define DMX_GET_PIXMAP_PRIV(_pPix)                                      \
-00065     (dmxPixPrivPtr)(_pPix)->devPrivates[dmxPixPrivateIndex].ptr
-00066 
-00067 #endif /* DMXPIXMAP_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html index 27cc6a5da..8feb86bea 100644 --- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html @@ -6,337 +6,285 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxpixmap.h File Reference

#include "pixmapstr.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxpixmap.h File Reference

#include "pixmapstr.h"
+

Go to the source code of this file.

+

Data Structures

struct  _dmxPixPriv

Defines

#define DMX_GET_PIXMAP_PRIV(_pPix)   (dmxPixPrivPtr)(_pPix)->devPrivates[dmxPixPrivateIndex].ptr

Typedefs

typedef _dmxPixPriv dmxPixPrivRec
typedef _dmxPixPriv * dmxPixPrivPtr

Functions

Bool dmxInitPixmap (ScreenPtr pScreen)
PixmapPtr dmxCreatePixmap (ScreenPtr pScreen, int width, int height, int depth)
Bool dmxDestroyPixmap (PixmapPtr pPixmap)
RegionPtr dmxBitmapToRegion (PixmapPtr pPixmap)
void dmxBECreatePixmap (PixmapPtr pPixmap)
Bool dmxBEFreePixmap (PixmapPtr pPixmap)

Variables

int dmxPixPrivateIndex
+ + + + + + + + + + + + + + + +

Data Structures

struct  _dmxPixPriv

Defines

#define DMX_GET_PIXMAP_PRIV(_pPix)   (dmxPixPrivPtr)dixLookupPrivate(&(_pPix)->devPrivates, dmxPixPrivateKey)

Typedefs

typedef struct _dmxPixPriv dmxPixPrivRec
typedef struct _dmxPixPriv * dmxPixPrivPtr

Functions

Bool dmxInitPixmap (ScreenPtr pScreen)
PixmapPtr dmxCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)
Bool dmxDestroyPixmap (PixmapPtr pPixmap)
RegionPtr dmxBitmapToRegion (PixmapPtr pPixmap)
void dmxBECreatePixmap (PixmapPtr pPixmap)
Bool dmxBEFreePixmap (PixmapPtr pPixmap)

Variables

DevPrivateKey dmxPixPrivateKey
-

Detailed Description

-Interface for pixmap support.
See also:
dmxpixmap.c
-

Define Documentation

-

- - - - -
- +

Detailed Description

+

Interface for pixmap support.

+
See also:
dmxpixmap.c
+

Define Documentation

+ +
+
+
- - - - - - + + + + + +
#define DMX_GET_PIXMAP_PRIV( _pPix   )    (dmxPixPrivPtr)(_pPix)->devPrivates[dmxPixPrivateIndex].ptr + #define DMX_GET_PIXMAP_PRIV(_pPix  )    (dmxPixPrivPtr)dixLookupPrivate(&(_pPix)->devPrivates, dmxPixPrivateKey)
-
- - - - - -
-   - + +
+

Get pixmap private pointer.

-

-Get pixmap private pointer.

-

Typedef Documentation

-

- - - - -
- +

Referenced by dmxBECreatePixmap(), dmxBEFreePixmap(), dmxBERestorePixmap(), dmxBESavePixmap(), dmxBitmapToRegion(), dmxChangeGC(), dmxCreatePixmap(), dmxDestroyPixmap(), dmxDoChangeWindowAttributes(), dmxDoCreatePicture(), and dmxFindAlternatePixmap().

+ + + +

Typedef Documentation

+ +
+
+
- +
typedef struct _dmxPixPriv * dmxPixPrivPtr + typedef struct _dmxPixPriv * dmxPixPrivPtr
-
- - - - - -
-   - + +
-

-Pixmap private area.

-

- - - - -
- + + + +
+
+
- +
typedef struct _dmxPixPriv dmxPixPrivRec + typedef struct _dmxPixPriv dmxPixPrivRec
-
- - - - - -
-   - + +
+

Pixmap private area.

-

-Pixmap private area.

-

Function Documentation

-

- - - - -
- + + +

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxBECreatePixmap ( PixmapPtr  pPixmap  ) void dmxBECreatePixmap (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - + +
+

Create a pixmap on the back-end server.

-

-Create a pixmap on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, dmxSync(), _dmxPixPriv::pixmap, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxAttachScreen(), dmxBECreateResources(), dmxBECreateWindowTree(), dmxBERestoreRenderPict(), and dmxCreatePixmap().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxBEFreePixmap ( PixmapPtr  pPixmap  ) Bool dmxBEFreePixmap (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - + +
+

Destroy the pixmap on the back-end server.

-

-Destroy the pixmap on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxBEDestroyResources(), dmxBEDestroyWindowTree(), dmxDestroyPixmap(), and dmxDetachScreen().

+ + + + +
+
+
- - - - - - + + + + + + -
RegionPtr dmxBitmapToRegion ( PixmapPtr  pPixmap  ) RegionPtr dmxBitmapToRegion (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - + +
+

Create and return a region based on the pixmap pointed to by pPixmap.

-

-Create and return a region based on the pixmap pointed to by pPixmap.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_GET_PIXMAP_PRIV, dmxScreens, dmxSync(), and _dmxPixPriv::pixmap.

+ +

Referenced by dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + + + + + + - - + + - - + + -
PixmapPtr dmxCreatePixmap ( ScreenPtr  pScreen, PixmapPtr dmxCreatePixmap (ScreenPtr  pScreen,
int  width, int  width,
int  height, int  height,
int  depth,
int  depthunsigned  usage_hint 
) )
-
- - - - - -
-   - + +
+

Create a pixmap for pScreen with the specified width, height, and depth.

-

-Create a pixmap for pScreen with the specified width, height, and depth.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBECreatePixmap(), dmxCreatePixmap(), dmxScreens, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxCreatePixmap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxDestroyPixmap ( PixmapPtr  pPixmap  ) Bool dmxDestroyPixmap (PixmapPtr  pPixmap ) 
-
- - - - - -
-   - + +
+

Destroy the pixmap pointed to by pPixmap.

-

-Destroy the pixmap pointed to by pPixmap.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _dmxPixPriv::detachedImage, DMX_GET_PIXMAP_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEFreePixmap(), dmxDestroyPixmap(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyPixmap(), and dmxScreenInit().

+ + + + +
+
+
- - - - - - + + + + + + -
Bool dmxInitPixmap ( ScreenPtr  pScreen  ) Bool dmxInitPixmap (ScreenPtr  pScreen ) 
-
- - - - - -
-   - + +
+

Initialize a private area in pScreen for pixmap information.

-

-Initialize a private area in pScreen for pixmap information.

-

Variable Documentation

-

- - - - -
- +

References dmxPixPrivateKey.

+ +

Referenced by dmxScreenInit().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxPixPrivateIndex + DevPrivateKey dmxPixPrivateKey
-
- - - - - -
-   - + +
+

Private index.

+
See also:
dmxpicmap.h
+
+dmxscrinit.c
+

Private index for Pixmaps

-

-Private index.

See also:
dmxpicmap.h

-dmxscrinit.c

-
+

Referenced by dmxInitPixmap().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html new file mode 100644 index 000000000..3911ae4a7 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html @@ -0,0 +1,97 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8c.html b/xorg-server/hw/dmx/doc/html/dmxprint_8c.html index 9a439cf6b..d52dacec5 100644 --- a/xorg-server/hw/dmx/doc/html/dmxprint_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxprint_8c.html @@ -6,105 +6,697 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxprint.c File Reference

#include "dmxconfig.h"
-#include "dmxparse.h"
-#include "dmxprint.h"
-#include "parser.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <ctype.h>
- - - - - - - - - - + + +
+

dmxprint.c File Reference

#include "dmxconfig.h"
+#include "dmxparse.h"
+#include "dmxprint.h"
+#include "parser.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+

Data Structures

struct  stack

Functions

void dmxConfigPrint (FILE *stream, DMXConfigEntryPtr entry)
void dmxConfigVirtualPrint (FILE *stream, DMXConfigVirtualPtr p)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  stack

Functions

static void dmxConfigIndent (void)
static void dmxConfigNewline (void)
static void dmxConfigPushState (int base, int comment, int step)
static void dmxConfigPushComment (void)
static void dmxConfigPushStep (void)
static void dmxConfigPopState (void)
static void dmxConfigOutput (int addSpace, int doNewline, const char *comment, const char *format,...)
static void dmxConfigPrintComment (DMXConfigCommentPtr p)
static void dmxConfigPrintTokenFlag (DMXConfigTokenPtr p, int flag)
static void dmxConfigPrintToken (DMXConfigTokenPtr p)
static void dmxConfigPrintTokenNopop (DMXConfigTokenPtr p)
static int dmxConfigPrintQuotedString (const char *s)
static void dmxConfigPrintString (DMXConfigStringPtr p, int quote)
static int dmxConfigPrintPair (DMXConfigPairPtr p, int addSpace)
static void dmxConfigPrintDisplay (DMXConfigDisplayPtr p)
static void dmxConfigPrintWall (DMXConfigWallPtr p)
static void dmxConfigPrintOption (DMXConfigOptionPtr p)
static void dmxConfigPrintParam (DMXConfigParamPtr p)
static void dmxConfigPrintSub (DMXConfigSubPtr p)
static void dmxConfigPrintVirtual (DMXConfigVirtualPtr p)
void dmxConfigPrint (FILE *stream, DMXConfigEntryPtr entry)
void dmxConfigVirtualPrint (FILE *stream, DMXConfigVirtualPtr p)

Variables

static FILE * str = NULL
static int indent = 0
static int pos = 0
static struct stack initialStack
-

Detailed Description

-This file provides support routines and helper functions to be used to pretty-print DMX configurations.

-Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support routines and helper functions to be used to pretty-print DMX configurations.

+

Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.

+

Function Documentation

+ +
+
+
+ + + + + + + + +
static void dmxConfigIndent (void  )  [static]
+ +
+ +

References indent, and str.

+ +

Referenced by dmxConfigOutput().

+ +
+ + +
+
+ + + + + + + + + +
static void dmxConfigNewline (void  )  [static]
+
+
+ +

References pos, and str.

+ +

Referenced by dmxConfigOutput(), dmxConfigPopState(), dmxConfigPrint(), dmxConfigPushState(), and dmxConfigVirtualPrint().

+ +
+
+ +
+
+ + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + - - + + +
static void dmxConfigOutput (int  addSpace,
int  doNewline,
void dmxConfigPrint ( FILE *  stream, const char *  comment,
const char *  format,
DMXConfigEntryPtr  entry  ... 
) ) [static]
+
+
+ +

References dmxConfigIndent(), dmxConfigNewline(), dmxConfigPushComment(), pos, and str.

+ +

Referenced by dmxConfigPrintComment(), dmxConfigPrintPair(), dmxConfigPrintString(), and dmxConfigPrintTokenFlag().

+
+
+ +
+
+ + + + + + + + +
static void dmxConfigPopState (void  )  [static]
-
- - - - - -
-   - - -

-The configuration information in entry will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

-

- - - - -
- + +
+ +

References stack::base, dmxConfigFree(), dmxConfigLog(), dmxConfigNewline(), indent, and stack::next.

+ +

Referenced by dmxConfigPrintTokenFlag().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + +
void dmxConfigPrint (FILE *  stream,
DMXConfigEntryPtr  entry 
)
+ +
+

The configuration information in entry will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

+ +

References _DMXConfigEntry::comment, dmxConfigComment, dmxConfigLog(), dmxConfigNewline(), dmxConfigPrintComment(), dmxConfigPrintVirtual(), dmxConfigVirtual, _DMXConfigEntry::next, pos, str, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigWriteFile(), and main().

+ +
+ + +
+
+ + + + + + + + + +
static void dmxConfigPrintComment (DMXConfigCommentPtr  p )  [static]
+
+
+ +

References _DMXConfigComment::comment, and dmxConfigOutput().

+ +

Referenced by dmxConfigPrint(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintDisplay (DMXConfigDisplayPtr  p )  [static]
+
+
+ +

References _DMXConfigPartDim::dim, _DMXConfigDisplay::dim, dmxConfigPrintPair(), dmxConfigPrintString(), dmxConfigPrintToken(), _DMXConfigDisplay::dname, _DMXConfigDisplay::end, _DMXConfigDisplay::name, _DMXConfigPartDim::offset, _DMXConfigDisplay::origin, _DMXConfigFullDim::root, _DMXConfigDisplay::rootHeight, _DMXConfigDisplay::rootWidth, _DMXConfigDisplay::rootX, _DMXConfigDisplay::rootXOrigin, _DMXConfigDisplay::rootXSign, _DMXConfigDisplay::rootY, _DMXConfigDisplay::rootYOrigin, _DMXConfigDisplay::rootYSign, _DMXConfigFullDim::scrn, _DMXConfigDisplay::scrnHeight, _DMXConfigDisplay::scrnWidth, _DMXConfigDisplay::scrnX, _DMXConfigDisplay::scrnY, _DMXConfigDisplay::start, _DMXConfigString::string, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintOption (DMXConfigOptionPtr  p )  [static]
+
+
+ +

References dmxConfigPrintString(), dmxConfigPrintToken(), _DMXConfigOption::end, _DMXConfigOption::start, _DMXConfigOption::string, and _DMXConfigString::string.

+ +

Referenced by dmxConfigPrintSub().

+ +
+
+ +
+
+ - - - - + + + + + + + + + - - + + + +
void dmxConfigVirtualPrint ( FILE *  stream, static int dmxConfigPrintPair (DMXConfigPairPtr  p,
int  addSpace 
DMXConfigVirtualPtr  p) [static]
+
+
+ +

References _DMXConfigPair::comment, dmxConfigOutput(), _DMXConfigPair::token, _DMXConfigPair::x, _DMXConfigPair::xsign, _DMXConfigPair::y, and _DMXConfigPair::ysign.

+ +

Referenced by dmxConfigPrintDisplay(), dmxConfigPrintVirtual(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintParam (DMXConfigParamPtr  p )  [static]
+
+
+ +

References _DMXConfigParam::close, dmxConfigLog(), dmxConfigPrintString(), dmxConfigPrintToken(), dmxConfigPrintTokenNopop(), _DMXConfigParam::end, _DMXConfigParam::next, _DMXConfigParam::open, _DMXConfigParam::param, and _DMXConfigParam::start.

+ +

Referenced by dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + + + + + + +
static int dmxConfigPrintQuotedString (const char *  s )  [static]
+
+
+ +

Referenced by dmxConfigPrintString().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + +
static void dmxConfigPrintString (DMXConfigStringPtr  p,
int  quote 
) ) [static]
+
+
+ +

References _DMXConfigString::comment, dmxConfigOutput(), dmxConfigPrintQuotedString(), _DMXConfigString::next, and _DMXConfigString::string.

+ +

Referenced by dmxConfigPrintDisplay(), dmxConfigPrintOption(), dmxConfigPrintParam(), dmxConfigPrintVirtual(), and dmxConfigPrintWall().

+
+
+ +
+
+ + + + + + + + +
static void dmxConfigPrintSub (DMXConfigSubPtr  p )  [static]
-
- - - - - -
-   - - -

-The configuration information in p will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

+ +

+ +

References _DMXConfigSub::comment, _DMXConfigSub::display, dmxConfigComment, dmxConfigDisplay, dmxConfigLog(), dmxConfigOption, dmxConfigParam, dmxConfigPrintComment(), dmxConfigPrintDisplay(), dmxConfigPrintOption(), dmxConfigPrintParam(), dmxConfigPrintWall(), dmxConfigWall, _DMXConfigSub::next, _DMXConfigSub::option, _DMXConfigSub::param, _DMXConfigSub::type, and _DMXConfigSub::wall.

+ +

Referenced by dmxConfigPrintVirtual().

+ +
+ + +
+
+ + + + + + + + + +
static void dmxConfigPrintToken (DMXConfigTokenPtr  p )  [static]
+
+
+ +

References dmxConfigPrintTokenFlag().

+ +

Referenced by dmxConfigPrintDisplay(), dmxConfigPrintOption(), dmxConfigPrintParam(), dmxConfigPrintVirtual(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
static void dmxConfigPrintTokenFlag (DMXConfigTokenPtr  p,
int  flag 
) [static]
+
+
+ +

References _DMXConfigToken::comment, dmxConfigLog(), dmxConfigOutput(), dmxConfigPopState(), dmxConfigPushState(), dmxConfigPushStep(), _DMXConfigToken::line, and _DMXConfigToken::token.

+ +

Referenced by dmxConfigPrintToken(), and dmxConfigPrintTokenNopop().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintTokenNopop (DMXConfigTokenPtr  p )  [static]
+
+
+ +

References dmxConfigPrintTokenFlag().

+ +

Referenced by dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintVirtual (DMXConfigVirtualPtr  p )  [static]
+
+
+ +

References _DMXConfigVirtual::close, _DMXConfigVirtual::dim, dmxConfigPrintPair(), dmxConfigPrintString(), dmxConfigPrintSub(), dmxConfigPrintToken(), _DMXConfigVirtual::height, _DMXConfigVirtual::name, _DMXConfigVirtual::open, _DMXConfigVirtual::start, _DMXConfigString::string, _DMXConfigVirtual::subentry, _DMXConfigVirtual::vname, _DMXConfigVirtual::width, _DMXConfigPair::x, and _DMXConfigPair::y.

+ +

Referenced by dmxConfigPrint(), and dmxConfigVirtualPrint().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPrintWall (DMXConfigWallPtr  p )  [static]
+
+
+ +

References _DMXConfigWall::displayDim, dmxConfigPrintPair(), dmxConfigPrintString(), dmxConfigPrintToken(), _DMXConfigWall::end, _DMXConfigWall::nameList, _DMXConfigWall::start, and _DMXConfigWall::wallDim.

+ +

Referenced by dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPushComment (void  )  [static]
+
+
+ +

References indent.

+ +

Referenced by dmxConfigOutput().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
static void dmxConfigPushState (int  base,
int  comment,
int  step 
) [static]
+
+
+ +

References dmxConfigAlloc(), dmxConfigNewline(), and indent.

+ +

Referenced by dmxConfigPrintTokenFlag().

+ +
+
+ +
+
+ + + + + + + + + +
static void dmxConfigPushStep (void  )  [static]
+
+
+ +

References indent.

+ +

Referenced by dmxConfigPrintTokenFlag().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxConfigVirtualPrint (FILE *  stream,
DMXConfigVirtualPtr  p 
)
+
+
+

The configuration information in p will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

+ +

References dmxConfigNewline(), dmxConfigPrintVirtual(), pos, and str.

+ +

Referenced by dmxConfigReadFile(), and dmxConfigSelectCallback().

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
int indent = 0 [static]
+
+
+ +

Referenced by dmxConfigIndent(), dmxConfigPopState(), dmxConfigPushComment(), dmxConfigPushState(), and dmxConfigPushStep().

+ +
+
+ +
+
+ + + + +
struct stack initialStack [static]
+
+
+ +
+
+ +
+
+ + + + +
int pos = 0 [static]
+
+
+ +

Referenced by dmxBERestoreRenderGlyph(), dmxConfigNewline(), dmxConfigOutput(), dmxConfigPrint(), and dmxConfigVirtualPrint().

+ +
+
+ +
+
+ + + + +
FILE* str = NULL [static]
+
+
+ +

Referenced by dmxConfigIndent(), dmxConfigNewline(), dmxConfigOutput(), dmxConfigPrint(), dmxConfigReadFile(), dmxConfigVirtualPrint(), dmxConfigWriteFile(), dmxVDLRead(), and main().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html deleted file mode 100644 index c1a0d4edb..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxprint.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXPRINT_H_
-00039 #define _DMXPRINT_H_
-00040 
-00041 void dmxConfigPrint(FILE *str, DMXConfigEntryPtr entry);
-00042 void dmxConfigVirtualPrint(FILE *str, DMXConfigVirtualPtr p);
-00043 
-00044 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h.html index c12085c7b..ea6c15cb9 100644 --- a/xorg-server/hw/dmx/doc/html/dmxprint_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxprint_8h.html @@ -6,97 +6,99 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxprint.h File Reference

-

-Go to the source code of this file. - - - - - - +

Go to the source code of this file.

+

Functions

void dmxConfigPrint (FILE *str, DMXConfigEntryPtr entry)
void dmxConfigVirtualPrint (FILE *str, DMXConfigVirtualPtr p)
+ + +

Functions

void dmxConfigPrint (FILE *str, DMXConfigEntryPtr entry)
void dmxConfigVirtualPrint (FILE *str, DMXConfigVirtualPtr p)
-

Detailed Description

-Interface to DMX configuration file pretty-printer.
See also:
dmxprint.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to DMX configuration file pretty-printer.

+
See also:
dmxprint.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxConfigPrint ( FILE *  stream, void dmxConfigPrint (FILE *  stream,
DMXConfigEntryPtr  entryDMXConfigEntryPtr  entry 
) )
-
- - - - - -
-   - + +
+

The configuration information in entry will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

-

-The configuration information in entry will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

-

- - - - -
- +

References _DMXConfigEntry::comment, dmxConfigComment, dmxConfigLog(), dmxConfigNewline(), dmxConfigPrintComment(), dmxConfigPrintVirtual(), dmxConfigVirtual, _DMXConfigEntry::next, pos, str, _DMXConfigEntry::type, and _DMXConfigEntry::virtual.

+ +

Referenced by dmxConfigWriteFile(), and main().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxConfigVirtualPrint ( FILE *  stream, void dmxConfigVirtualPrint (FILE *  stream,
DMXConfigVirtualPtr  pDMXConfigVirtualPtr  p 
) )
-
- - - - - -
-   - + +
+

The configuration information in p will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

-

-The configuration information in p will be pretty-printed to the stream. If stream is NULL, then stdout will be used.

+

References dmxConfigNewline(), dmxConfigPrintVirtual(), pos, and str.

+ +

Referenced by dmxConfigReadFile(), and dmxConfigSelectCallback().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html new file mode 100644 index 000000000..a4b25b8e6 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html @@ -0,0 +1,76 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8c.html b/xorg-server/hw/dmx/doc/html/dmxprop_8c.html index 6fa746b53..7bb916b5f 100644 --- a/xorg-server/hw/dmx/doc/html/dmxprop_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxprop_8c.html @@ -6,221 +6,332 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxprop.c File Reference

#include "dmx.h"
-#include "dmxprop.h"
-#include "dmxlog.h"
- - - - - - - - - + + +
+

dmxprop.c File Reference

#include "dmx.h"
+#include "dmxprop.h"
+#include "dmxlog.h"
+

Defines

#define DMX_ATOMNAME   "DMX_NAME"
#define DMX_IDENT   "Xdmx"

Functions

void * dmxPropertyIterate (DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *), void *closure)
+ + + + + + + + + + + + + + +

Defines

#define DMX_ATOMNAME   "DMX_NAME"
#define DMX_IDENT   "Xdmx"

Functions

static int dmxPropertyErrorHandler (Display *dpy, XErrorEvent *ev)
static const unsigned char * dmxPropertyIdentifier (void)
void * dmxPropertyIterate (DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *), void *closure)
static int dmxPropertyCheckOtherServers (DMXScreenInfo *dmxScreen, Atom atom)
static DMXScreenInfo * dmxPropertyCheckOtherWindows (DMXScreenInfo *dmxScreen, Atom atom)
int dmxPropertyDisplay (DMXScreenInfo *dmxScreen)
int dmxPropertySameDisplay (DMXScreenInfo *dmxScreen, const char *name)
void dmxPropertyWindow (DMXScreenInfo *dmxScreen)

Variables

char * display
+

Detailed Description

+

It is possible for one of the DMX "backend displays" to actually be smaller than the dimensions of the backend X server. Therefore, it is possible for more than one of the DMX "backend displays" to be physically located on the same backend X server. This situation must be detected so that cursor motion can be handled in an expected fashion.

+

We could analyze the names used for the DMX "backend displays" (e.g., the names passed to the -display command-line parameter), but there are many possible names for a single X display, and failing to detect sameness leads to very unexpected results. Therefore, whenever the DMX server opens a window on a backend X server, a property value is queried and set on that backend to detect when another window is already open on that server.

+

Further, it is possible that two different DMX server instantiations both have windows on the same physical backend X server. This case is also detected so that pointer input is not taken from that particular backend X server.

+

The routines in this file handle the property management.

+

Define Documentation

+ +
+
+ + + + +
#define DMX_ATOMNAME   "DMX_NAME"
+
+
+

Holds the window id of all DMX windows on the backend X server.

-
int dmxPropertyDisplay (DMXScreenInfo *dmxScreen)
int dmxPropertySameDisplay (DMXScreenInfo *dmxScreen, const char *name)
+ + + +
#define DMX_IDENT   "Xdmx"
+ +

+

The identification string of this DMX server

-
void dmxPropertyWindow (DMXScreenInfo *dmxScreen)
-

Detailed Description

-It is possible for one of the DMX "backend displays" to actually be smaller than the dimensions of the backend X server. Therefore, it is possible for more than one of the DMX "backend displays" to be physically located on the same backend X server. This situation must be detected so that cursor motion can be handled in an expected fashion.

-We could analyze the names used for the DMX "backend displays" (e.g., the names passed to the -display command-line parameter), but there are many possible names for a single X display, and failing to detect sameness leads to very unexpected results. Therefore, whenever the DMX server opens a window on a backend X server, a property value is queried and set on that backend to detect when another window is already open on that server.

-Further, it is possible that two different DMX server instantiations both have windows on the same physical backend X server. This case is also detected so that pointer input is not taken from that particular backend X server.

-The routines in this file handle the property management.

Define Documentation

-

- - - - -
- - -
#define DMX_ATOMNAME   "DMX_NAME" -
-
- - - - - -
-   - - -

-Holds the window id of all DMX windows on the backend X server.

-

- - - - -
- + + +

Function Documentation

+ +
+
+
-
#define DMX_IDENT   "Xdmx" -
-
- - - - - -
-   - - -

-The identification string of this DMX server

-

Function Documentation

-

- - - - -
- + + + + + - - - - - - + + + + + + + + + -
static int dmxPropertyCheckOtherServers (DMXScreenInfo *  dmxScreen,
int dmxPropertyDisplay ( DMXScreenInfo *  dmxScreen  ) Atom  atom 
) [static]
-
- - - - - -
-   - - -

-Returns 0 if this is the only Xdmx session on the display; 1 otherwise.

-

- - - - -
- + +
+

Returns 0 if this is the only Xdmx session on the display; 1 otherwise.

+ +

References _DMXScreenInfo::beDisplay, DMX_IDENT, dmxLogOutput(), dmxLogOutputWarning(), dmxPropertyErrorHandler(), and _DMXScreenInfo::name.

+ +

Referenced by dmxPropertyDisplay().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + +
void* dmxPropertyIterate ( DMXScreenInfo *  start, static DMXScreenInfo* dmxPropertyCheckOtherWindows (DMXScreenInfo *  dmxScreen,
Atom  atom 
void *(*  f)(DMXScreenInfo *dmxScreen, void *), ) [static]
+ +
+

Returns NULL if this is the only Xdmx window on the display. Otherwise, returns a pointer to the dmxScreen of the other windows on the display.

+ +

References _DMXScreenInfo::beDisplay, dmxDebug, dmxLog(), dmxNumScreens, dmxPropertyErrorHandler(), dmxPropertyIdentifier(), dmxScreens, and _DMXScreenInfo::name.

+ +

Referenced by dmxPropertyWindow().

+ +
+ + +
+
+ + + + + + + +
int dmxPropertyDisplay (DMXScreenInfo *  dmxScreen ) 
+
+
+

Returns 0 if this is the only Xdmx session on the display; 1 otherwise.

+ +

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxPropertyCheckOtherServers(), dmxPropertyIdentifier(), and _DMXScreenInfo::shared.

+ +

Referenced by dmxOpenDisplay().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static int dmxPropertyErrorHandler (Display *  dpy,
void *  closureXErrorEvent *  ev 
) ) [static]
+
+
+

Referenced by dmxPropertyCheckOtherServers(), and dmxPropertyCheckOtherWindows().

+ +
+
+ +
+
+ + + + + + + + +
static const unsigned char* dmxPropertyIdentifier (void  )  [static]
-
- - - - - -
-   - - -

-Starting with the start screen, iterate over all of the screens on the same physical X server as start, calling f with the screen and the closure. (The common case is that start is the only DMX window on the backend X server.)

-

- - - - -
- + +
+ +

References display, and DMX_IDENT.

+ +

Referenced by dmxPropertyCheckOtherWindows(), dmxPropertyDisplay(), and dmxPropertyWindow().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + - - + + +
int dmxPropertySameDisplay ( DMXScreenInfo *  dmxScreen, void* dmxPropertyIterate (DMXScreenInfo *  start,
void *(*)(DMXScreenInfo *dmxScreen, void *)  f,
const char *  namevoid *  closure 
) )
+ +
+

Starting with the start screen, iterate over all of the screens on the same physical X server as start, calling f with the screen and the closure. (The common case is that start is the only DMX window on the backend X server.)

+ +

References _DMXScreenInfo::beDisplay, dmxDebug, dmxLog(), and _DMXScreenInfo::next.

+

Referenced by dmxBackendFindWindow(), dmxBackendGetEvent(), dmxBackendPendingMotionEvent(), dmxBackendSameDisplay(), dmxCommonMouOff(), dmxCommonMouOn(), and dmxInitOverlap().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
int dmxPropertySameDisplay (DMXScreenInfo *  dmxScreen,
const char *  name 
)
-
- - - - - -
-   - - -

-Returns 1 if the dmxScreen and the display in name are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).

-

- - - - -
- + +
+

Returns 1 if the dmxScreen and the display in name are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).

+ +

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxDebug, dmxLog(), dmxWarning, and _DMXScreenInfo::name.

+ +

Referenced by dmxBackendInitPrivate(), and dmxInputInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxPropertyWindow ( DMXScreenInfo *  dmxScreen  ) void dmxPropertyWindow (DMXScreenInfo *  dmxScreen ) 
+ +
+

Prints a log message if dmxScreen is on the same backend X server as some other DMX backend (output) screen. Modifies the property (DMX_ATOMNAME) on the backend X server to reflect the creation of dmxScreen.

+

The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).

+

This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):

+

"#DMX_IDENT:<hostname running DMX>:<display name of DMX>,<screen number>"

+ +

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxDebug, dmxLog(), dmxPropertyCheckOtherWindows(), dmxPropertyIdentifier(), _DMXScreenInfo::index, _DMXScreenInfo::name, _DMXScreenInfo::next, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBEScreenInit().

+
+ +

Variable Documentation

+ +
+
+ + + +
char* display
-
- - - - - -
-   - - -

-Prints a log message if dmxScreen is on the same backend X server as some other DMX backend (output) screen. Modifies the property (DMX_ATOMNAME) on the backend X server to reflect the creation of dmxScreen.

-The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).

-This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):

-"#DMX_IDENT:<hostname running DMX>:<display name of DMX>,<screen number>"

+

+
+ +

Referenced by dmxCommonOthGetInfo(), dmxConfigCanvasInput(), dmxInputScanForExtensions(), dmxPropertyIdentifier(), and dmxVDLRead().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html deleted file mode 100644 index a623a3b95..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxprop.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXPROP_H_
-00039 #define _DMXPROP_H_
-00040 extern int  dmxPropertyDisplay(DMXScreenInfo *dmxScreen);
-00041 extern void dmxPropertyWindow(DMXScreenInfo *dmxScreen);
-00042 extern void *dmxPropertyIterate(DMXScreenInfo *start,
-00043                                 void *(*f)(DMXScreenInfo *dmxScreen,
-00044                                            void *closure),
-00045                                 void *closure);
-00046 extern int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name);
-00047 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h.html index bc8210b47..c26888a1e 100644 --- a/xorg-server/hw/dmx/doc/html/dmxprop_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxprop_8h.html @@ -6,122 +6,151 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxprop.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

int dmxPropertyDisplay (DMXScreenInfo *dmxScreen)
void dmxPropertyWindow (DMXScreenInfo *dmxScreen)
int dmxPropertySameDisplay (DMXScreenInfo *dmxScreen, const char *name)
+ + + + +

Functions

int dmxPropertyDisplay (DMXScreenInfo *dmxScreen)
void dmxPropertyWindow (DMXScreenInfo *dmxScreen)
void * dmxPropertyIterate (DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *closure), void *closure)
int dmxPropertySameDisplay (DMXScreenInfo *dmxScreen, const char *name)
-

Detailed Description

-Interface for property support.
See also:
dmxprop.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for property support.

+
See also:
dmxprop.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
int dmxPropertyDisplay ( DMXScreenInfo *  dmxScreen  ) int dmxPropertyDisplay (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - + +
+

Returns 0 if this is the only Xdmx session on the display; 1 otherwise.

-

-Returns 0 if this is the only Xdmx session on the display; 1 otherwise.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxPropertyCheckOtherServers(), dmxPropertyIdentifier(), and _DMXScreenInfo::shared.

+ +

Referenced by dmxOpenDisplay().

+ + + + +
+
+
- - - - + + + + + + + + + + - - + + - - + + -
int dmxPropertySameDisplay ( DMXScreenInfo *  dmxScreen, void* dmxPropertyIterate (DMXScreenInfo *  start,
void *(*)(DMXScreenInfo *dmxScreen, void *closure)  f,
const char *  namevoid *  closure 
) )
-
- - - - - -
-   - + +
-

-Returns 1 if the dmxScreen and the display in name are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).

-

- - - - -
- + + + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
int dmxPropertySameDisplay (DMXScreenInfo *  dmxScreen,
const char *  name 
void dmxPropertyWindow ( DMXScreenInfo *  dmxScreen  ) )
+ +
+

Returns 1 if the dmxScreen and the display in name are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).

+ +

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxDebug, dmxLog(), dmxWarning, and _DMXScreenInfo::name.

+ +

Referenced by dmxBackendInitPrivate(), and dmxInputInit().

+
+ + +
+
+ + + + + + + + +
void dmxPropertyWindow (DMXScreenInfo *  dmxScreen ) 
-
- - - - - -
-   - + +
+

Prints a log message if dmxScreen is on the same backend X server as some other DMX backend (output) screen. Modifies the property (DMX_ATOMNAME) on the backend X server to reflect the creation of dmxScreen.

+

The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).

+

This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):

+

"#DMX_IDENT:<hostname running DMX>:<display name of DMX>,<screen number>"

-

-Prints a log message if dmxScreen is on the same backend X server as some other DMX backend (output) screen. Modifies the property (DMX_ATOMNAME) on the backend X server to reflect the creation of dmxScreen.

-The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).

-This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):

-"#DMX_IDENT:<hostname running DMX>:<display name of DMX>,<screen number>"

+

References _DMXScreenInfo::beDisplay, DMX_ATOMNAME, dmxDebug, dmxLog(), dmxPropertyCheckOtherWindows(), dmxPropertyIdentifier(), _DMXScreenInfo::index, _DMXScreenInfo::name, _DMXScreenInfo::next, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBEScreenInit().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html new file mode 100644 index 000000000..cacdb0373 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html @@ -0,0 +1,79 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html deleted file mode 100644 index 679d60e73..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html +++ /dev/null @@ -1,431 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxproto.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00042 #ifndef _DMXSTR_H_
-00043 #define _DMXSTR_H_
-00044 
-00045 #define DMX_EXTENSION_NAME  "DMX"
-00046 #define DMX_EXTENSION_MAJOR 2
-00047 #define DMX_EXTENSION_MINOR 2
-00048 #define DMX_EXTENSION_PATCH 20040604
-00049 
-00050 /* These values must be larger than LastExtensionError.
-00051    The values in dmxext.h and dmxproto.h *MUST* match. */
-00052 #define DMX_BAD_XINERAMA     1001
-00053 #define DMX_BAD_VALUE        1002
-00054 
-00055 #define X_DMXQueryVersion                   0
-00056 #define X_DMXGetScreenCount                 1
-00057 #define X_DMXGetScreenInformationDEPRECATED 2
-00058 #define X_DMXGetWindowAttributes            3
-00059 #define X_DMXGetInputCount                  4
-00060 #define X_DMXGetInputAttributes             5
-00061 #define X_DMXForceWindowCreationDEPRECATED  6
-00062 #define X_DMXReconfigureScreenDEPRECATED    7
-00063 #define X_DMXSync                           8
-00064 #define X_DMXForceWindowCreation            9
-00065 #define X_DMXGetScreenAttributes           10
-00066 #define X_DMXChangeScreensAttributes       11
-00067 #define X_DMXAddScreen                     12
-00068 #define X_DMXRemoveScreen                  13
-00069 #define X_DMXGetDesktopAttributes          14
-00070 #define X_DMXChangeDesktopAttributes       15
-00071 #define X_DMXAddInput                      16
-00072 #define X_DMXRemoveInput                   17
-00073 
-00075 typedef struct {
-00076     CARD8   reqType;            /* dmxcode */
-00077     CARD8   dmxReqType;         /* X_DMXQueryVersion */
-00078     CARD16  length B16;
-00079 } xDMXQueryVersionReq;
-00080 #define sz_xDMXQueryVersionReq 4
-00081 
-00083 typedef struct {
-00084     BYTE    type;               /* X_Reply */
-00085     CARD8   ununsed;
-00086     CARD16  sequenceNumber B16;
-00087     CARD32  length B32;
-00088     CARD32  majorVersion B32;
-00089     CARD32  minorVersion B32;
-00090     CARD32  patchVersion B32;
-00091     CARD32  pad0 B32;
-00092     CARD32  pad1 B32;
-00093     CARD32  pad2 B32;
-00094 } xDMXQueryVersionReply;
-00095 #define sz_xDMXQueryVersionReply 32
-00096 
-00098 typedef struct {
-00099     CARD8   reqType;            /* DMXCode */
-00100     CARD8   dmxReqType;         /* X_DMXSync */
-00101     CARD16  length B16;
-00102 } xDMXSyncReq;
-00103 #define sz_xDMXSyncReq 4
-00104 
-00106 typedef struct {
-00107     BYTE    type;               /* X_Reply */
-00108     CARD8   unused;
-00109     CARD16  sequenceNumber B16;
-00110     CARD32  length B32;
-00111     CARD32  status B32;
-00112     CARD32  pad0 B32;
-00113     CARD32  pad1 B32;
-00114     CARD32  pad2 B32;
-00115     CARD32  pad3 B32;
-00116     CARD32  pad4 B32;
-00117 } xDMXSyncReply;
-00118 #define sz_xDMXSyncReply 32
-00119 
-00121 typedef struct {
-00122     CARD8   reqType;            /* DMXCode */
-00123     CARD8   dmxReqType;         /* X_DMXForceWindowCreation */
-00124     CARD16  length B16;
-00125     CARD32  window B32;
-00126 } xDMXForceWindowCreationReq;
-00127 #define sz_xDMXForceWindowCreationReq 8
-00128 
-00130 typedef struct {
-00131     BYTE    type;               /* X_Reply */
-00132     CARD8   unused;
-00133     CARD16  sequenceNumber B16;
-00134     CARD32  length B32;
-00135     CARD32  status B32;
-00136     CARD32  pad0 B32;
-00137     CARD32  pad1 B32;
-00138     CARD32  pad2 B32;
-00139     CARD32  pad3 B32;
-00140     CARD32  pad4 B32;
-00141 } xDMXForceWindowCreationReply;
-00142 #define sz_xDMXForceWindowCreationReply 32
-00143 
-00145 typedef struct {
-00146     CARD8   reqType;            /* DMXCode */
-00147     CARD8   dmxReqType;         /* X_DMXGetScreenCount */
-00148     CARD16  length B16;
-00149 } xDMXGetScreenCountReq;
-00150 #define sz_xDMXGetScreenCountReq 4
-00151 
-00153 typedef struct {
-00154     BYTE    type;               /* X_Reply */
-00155     CARD8   unused;
-00156     CARD16  sequenceNumber B16;
-00157     CARD32  length B32;
-00158     CARD32  screenCount B32;
-00159     CARD32  pad0 B32;
-00160     CARD32  pad1 B32;
-00161     CARD32  pad2 B32;
-00162     CARD32  pad3 B32;
-00163     CARD32  pad4 B32;
-00164 } xDMXGetScreenCountReply;
-00165 #define sz_xDMXGetScreenCountReply 32
-00166 
-00168 typedef struct {
-00169     CARD8   reqType;            /* DMXCode */
-00170     CARD8   dmxReqType;         /* X_DMXGetScreenAttributes */
-00171     CARD16  length B16;
-00172     CARD32  physicalScreen B32;
-00173 } xDMXGetScreenAttributesReq;
-00174 #define sz_xDMXGetScreenAttributesReq 8
-00175 
-00177 typedef struct {
-00178     BYTE    type;               /* X_Reply */
-00179     CARD8   unused;
-00180     CARD16  sequenceNumber B16;
-00181     CARD32  length B32;
-00182     CARD32  displayNameLength B32;
-00183     CARD32  logicalScreen B32;
-00184 
-00185     CARD16  screenWindowWidth B16;
-00186     CARD16  screenWindowHeight B16;
-00187     INT16   screenWindowXoffset B16;
-00188     INT16   screenWindowYoffset B16;
-00189 
-00190     CARD16  rootWindowWidth B16;
-00191     CARD16  rootWindowHeight B16;
-00192     INT16   rootWindowXoffset B16;
-00193     INT16   rootWindowYoffset B16;
-00194     INT16   rootWindowXorigin B16;
-00195     INT16   rootWindowYorigin B16;
-00196 } xDMXGetScreenAttributesReply;
-00197 #define sz_xDMXGetScreenAttributesReply 36
-00198 
-00200 typedef struct {
-00201     CARD8   reqType;            /* DMXCode */
-00202     CARD8   dmxReqType;         /* X_DMXChangeScreensAttributes */
-00203     CARD16  length B16;
-00204     CARD32  screenCount B32;
-00205     CARD32  maskCount B32;
-00206 } xDMXChangeScreensAttributesReq;
-00207 #define sz_xDMXChangeScreensAttributesReq 12
-00208 
-00210 typedef struct {
-00211     BYTE    type;               /* X_Reply */
-00212     CARD8   unused;
-00213     CARD16  sequenceNumber B16;
-00214     CARD32  length B32;
-00215     CARD32  status B32;
-00216     CARD32  errorScreen B32;
-00217     CARD32  pad0 B32;
-00218     CARD32  pad1 B32;
-00219     CARD32  pad2 B32;
-00220     CARD32  pad3 B32;
-00221 } xDMXChangeScreensAttributesReply;
-00222 #define sz_xDMXChangeScreensAttributesReply 32
-00223 
-00225 typedef struct {
-00226     CARD8   reqType;            /* DMXCode */
-00227     CARD8   dmxReqType;         /* X_DMXAddScreen */
-00228     CARD16  length B16;
-00229     CARD32  displayNameLength B32;
-00230     CARD32  physicalScreen B32;
-00231     CARD32  valueMask B32;
-00232 } xDMXAddScreenReq;
-00233 #define sz_xDMXAddScreenReq 16
-00234 
-00236 typedef struct {
-00237     BYTE    type;               /* X_Reply */
-00238     CARD8   unused;
-00239     CARD16  sequenceNumber B16;
-00240     CARD32  length B32;
-00241     CARD32  status B32;
-00242     CARD32  physicalScreen B32;
-00243     CARD32  pad0 B32;
-00244     CARD32  pad1 B32;
-00245     CARD32  pad2 B32;
-00246     CARD32  pad3 B32;
-00247 } xDMXAddScreenReply;
-00248 #define sz_xDMXAddScreenReply 32
-00249 
-00251 typedef struct {
-00252     CARD8   reqType;            /* DMXCode */
-00253     CARD8   dmxReqType;         /* X_DMXRemoveScreen */
-00254     CARD16  length B16;
-00255     CARD32  physicalScreen B32;
-00256 } xDMXRemoveScreenReq;
-00257 #define sz_xDMXRemoveScreenReq 8
-00258 
-00260 typedef struct {
-00261     BYTE    type;               /* X_Reply */
-00262     CARD8   unused;
-00263     CARD16  sequenceNumber B16;
-00264     CARD32  length B32;
-00265     CARD32  status B32;
-00266     CARD32  pad0 B32;
-00267     CARD32  pad1 B32;
-00268     CARD32  pad2 B32;
-00269     CARD32  pad3 B32;
-00270     CARD32  pad4 B32;
-00271 } xDMXRemoveScreenReply;
-00272 #define sz_xDMXRemoveScreenReply 32
-00273 
-00275 typedef struct {
-00276     CARD8   reqType;            /* DMXCode */
-00277     CARD8   dmxReqType;         /* X_DMXGetWindowAttributes */
-00278     CARD16  length B16;
-00279     CARD32  window B32;
-00280 } xDMXGetWindowAttributesReq;
-00281 #define sz_xDMXGetWindowAttributesReq 8
-00282 
-00284 typedef struct {
-00285     BYTE    type;               /* X_Reply */
-00286     CARD8   unused;
-00287     CARD16  sequenceNumber B16;
-00288     CARD32  length B32;
-00289     CARD32  screenCount B32;
-00290     CARD32  pad0 B32;
-00291     CARD32  pad1 B32;
-00292     CARD32  pad2 B32;
-00293     CARD32  pad3 B32;
-00294     CARD32  pad4 B32;
-00295 } xDMXGetWindowAttributesReply;
-00296 #define sz_xDMXGetWindowAttributesReply 32
-00297 
-00299 typedef struct {
-00300     CARD8   reqType;            /* DMXCode */
-00301     CARD8   dmxReqType;         /* X_DMXGetDesktopAttributes */
-00302     CARD16  length B16;
-00303 } xDMXGetDesktopAttributesReq;
-00304 #define sz_xDMXGetDesktopAttributesReq 4
-00305 
-00307 typedef struct {
-00308     BYTE    type;               /* X_Reply */
-00309     CARD8   unused;
-00310     CARD16  sequenceNumber B16;
-00311     CARD32  length B32;
-00312     INT16   width;
-00313     INT16   height;
-00314     INT16   shiftX;
-00315     INT16   shiftY;
-00316     CARD32  pad0 B32;
-00317     CARD32  pad1 B32;
-00318     CARD32  pad2 B32;
-00319     CARD32  pad3 B32;
-00320 } xDMXGetDesktopAttributesReply;
-00321 #define sz_xDMXGetDesktopAttributesReply 32
-00322 
-00324 typedef struct {
-00325     CARD8   reqType;            /* DMXCode */
-00326     CARD8   dmxReqType;         /* X_DMXChangeDesktopAttributes */
-00327     CARD16  length B16;
-00328     CARD32  valueMask B32;
-00329 } xDMXChangeDesktopAttributesReq;
-00330 #define sz_xDMXChangeDesktopAttributesReq 8
-00331 
-00333 typedef struct {
-00334     BYTE    type;               /* X_Reply */
-00335     CARD8   unused;
-00336     CARD16  sequenceNumber B16;
-00337     CARD32  length B32;
-00338     CARD32  status B32;
-00339     CARD32  pad0 B32;
-00340     CARD32  pad1 B32;
-00341     CARD32  pad2 B32;
-00342     CARD32  pad3 B32;
-00343     CARD32  pad4 B32;
-00344 } xDMXChangeDesktopAttributesReply;
-00345 #define sz_xDMXChangeDesktopAttributesReply 32
-00346 
-00348 typedef struct {
-00349     CARD8   reqType;            /* DMXCode */
-00350     CARD8   dmxReqType;         /* X_DMXGetInputCount */
-00351     CARD16  length B16;
-00352 } xDMXGetInputCountReq;
-00353 #define sz_xDMXGetInputCountReq 4
-00354 
-00356 typedef struct {
-00357     BYTE    type;               /* X_Reply */
-00358     CARD8   unused;
-00359     CARD16  sequenceNumber B16;
-00360     CARD32  length B32;
-00361     CARD32  inputCount B32;
-00362     CARD32  pad0 B32;
-00363     CARD32  pad1 B32;
-00364     CARD32  pad2 B32;
-00365     CARD32  pad3 B32;
-00366     CARD32  pad4 B32;
-00367 } xDMXGetInputCountReply;
-00368 #define sz_xDMXGetInputCountReply 32
-00369 
-00371 typedef struct {
-00372     CARD8   reqType;            /* DMXCode */
-00373     CARD8   dmxReqType;         /* X_DMXGetInputAttributes */
-00374     CARD16  length B16;
-00375     CARD32  deviceId B32;
-00376 } xDMXGetInputAttributesReq;
-00377 #define sz_xDMXGetInputAttributesReq 8
-00378 
-00380 typedef struct {
-00381     BYTE    type;               /* X_Reply */
-00382     CARD8   unused;
-00383     CARD16  sequenceNumber B16;
-00384     CARD32  length B32;
-00385     CARD32  inputType B32;
-00386     CARD32  physicalScreen B32;
-00387     CARD32  physicalId B32;
-00388     CARD32  nameLength B32;
-00389     BOOL    isCore;
-00390     BOOL    sendsCore;
-00391     BOOL    detached;
-00392     CARD8   pad0;
-00393     CARD32  pad1 B32;
-00394 } xDMXGetInputAttributesReply;
-00395 #define sz_xDMXGetInputAttributesReply 32
-00396 
-00398 typedef struct {
-00399     CARD8   reqType;            /* DMXCode */
-00400     CARD8   dmxReqType;         /* X_DMXAddInput */
-00401     CARD16  length B16;
-00402     CARD32  displayNameLength B32;
-00403     CARD32  valueMask;
-00404 } xDMXAddInputReq;
-00405 #define sz_xDMXAddInputReq 12
-00406 
-00408 typedef struct {
-00409     BYTE    type;               /* X_Reply */
-00410     CARD8   unused;
-00411     CARD16  sequenceNumber B16;
-00412     CARD32  length B32;
-00413     CARD32  status B32;
-00414     CARD32  physicalId B32;
-00415     CARD32  pad0 B32;
-00416     CARD32  pad1 B32;
-00417     CARD32  pad2 B32;
-00418     CARD32  pad3 B32;
-00419 } xDMXAddInputReply;
-00420 #define sz_xDMXAddInputReply 32
-00421 
-00423 typedef struct {
-00424     CARD8   reqType;            /* DMXCode */
-00425     CARD8   dmxReqType;         /* X_DMXRemoveInput */
-00426     CARD16  length B16;
-00427     CARD32  physicalId B32;
-00428 } xDMXRemoveInputReq;
-00429 #define sz_xDMXRemoveInputReq 8
-00430 
-00432 typedef struct {
-00433     BYTE     type;
-00434     CARD8    unused;
-00435     CARD16   sequenceNumber B16;
-00436     CARD32   length B32;
-00437     CARD32   status B32;
-00438     CARD32   pad0 B32;
-00439     CARD32   pad1 B32;
-00440     CARD32   pad2 B32;
-00441     CARD32   pad3 B32;
-00442     CARD32   pad4 B32;
-00443 } xDMXRemoveInputReply;
-00444 #define sz_xDMXRemoveInputReply 32
-00445 
-00446 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxproto_8h.html b/xorg-server/hw/dmx/doc/html/dmxproto_8h.html deleted file mode 100644 index 10353e338..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxproto_8h.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxproto.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Structures

struct  xDMXAddInputReply
struct  xDMXAddInputReq
struct  xDMXAddScreenReply
struct  xDMXAddScreenReq
struct  xDMXChangeDesktopAttributesReply
struct  xDMXChangeDesktopAttributesReq
struct  xDMXChangeScreensAttributesReply
struct  xDMXChangeScreensAttributesReq
struct  xDMXForceWindowCreationReply
struct  xDMXForceWindowCreationReq
struct  xDMXGetDesktopAttributesReply
struct  xDMXGetDesktopAttributesReq
struct  xDMXGetInputAttributesReply
struct  xDMXGetInputAttributesReq
struct  xDMXGetInputCountReply
struct  xDMXGetInputCountReq
struct  xDMXGetScreenAttributesReply
struct  xDMXGetScreenAttributesReq
struct  xDMXGetScreenCountReply
struct  xDMXGetScreenCountReq
struct  xDMXGetWindowAttributesReply
struct  xDMXGetWindowAttributesReq
struct  xDMXQueryVersionReply
struct  xDMXQueryVersionReq
struct  xDMXRemoveInputReply
struct  xDMXRemoveInputReq
struct  xDMXRemoveScreenReply
struct  xDMXRemoveScreenReq
struct  xDMXSyncReply
struct  xDMXSyncReq
-

Detailed Description

-This file describes the structures necessary to implement the wire protocol for the DMX protocol extension. It should be included only in files that implement the client-side (or server-side) part of the protocol (i.e., client-side applications should not include this file).
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html index d2425c3be..14e7a8008 100644 --- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html @@ -6,364 +6,478 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxscrinit.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxshadow.h"
-#include "dmxscrinit.h"
-#include "dmxcursor.h"
-#include "dmxgc.h"
-#include "dmxgcops.h"
-#include "dmxwindow.h"
-#include "dmxpixmap.h"
-#include "dmxfont.h"
-#include "dmxcmap.h"
-#include "dmxprop.h"
-#include "dmxdpms.h"
-#include "dmxpict.h"
-#include "fb.h"
-#include "mipointer.h"
-#include "micmap.h"
- - - - + + +
+

dmxscrinit.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxshadow.h"
+#include "dmxscrinit.h"
+#include "dmxcursor.h"
+#include "dmxgc.h"
+#include "dmxgcops.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+#include "dmxfont.h"
+#include "dmxcmap.h"
+#include "dmxprop.h"
+#include "dmxdpms.h"
+#include "dmxpict.h"
+#include "fb.h"
+#include "mipointer.h"
+#include "micmap.h"
+

Functions

Bool dmxCloseScreen (int idx, ScreenPtr pScreen)
+ + + + + + + + + + + + + + + + + + + + + + + + +

Functions

Bool dmxCloseScreen (int idx, ScreenPtr pScreen)
static Bool dmxSaveScreen (ScreenPtr pScreen, int what)
void dmxBEScreenInit (int idx, ScreenPtr pScreen)
Bool dmxScreenInit (int idx, ScreenPtr pScreen, int argc, char *argv[])
void dmxBECloseScreen (ScreenPtr pScreen)

Variables

static unsigned long dmxGeneration
static unsigned long * dmxCursorGeneration
static int dmxGCPrivateKeyIndex
DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKeyIndex
static int dmxWinPrivateKeyIndex
DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKeyIndex
static int dmxPixPrivateKeyIndex
DevPrivateKey dmxPixPrivateKey = &dmxPixPrivateKeyIndex
int dmxFontPrivateIndex
static int dmxScreenPrivateKeyIndex
DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex
static int dmxColormapPrivateKeyIndex
DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex
static int dmxPictPrivateKeyIndex
DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex
static int dmxGlyphSetPrivateKeyIndex
DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex
+

Detailed Description

+

This file provides support for screen initialization.

+

Function Documentation

+ +
+
+ + + + + + + + + +
void dmxBECloseScreen (ScreenPtr  pScreen ) 
+
+
+

Close the pScreen resources on the back-end server.

+ +

References _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, dmxDPMSTerm(), dmxScreens, dmxShadowFB, _DMXScreenInfo::noCursor, _DMXScreenInfo::scrnDefDrawables, _DMXScreenInfo::scrnWin, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

-void dmxBEScreenInit (int idx, ScreenPtr pScreen) +

Referenced by dmxCloseScreen(), and dmxDetachScreen().

-Bool dmxScreenInit (int idx, ScreenPtr pScreen, int argc, char *argv[]) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxBEScreenInit (int  idx,
ScreenPtr  pScreen 
)
+
+
+

Initialize the parts of screen idx that require access to the back-end server.

-void dmxBECloseScreen (ScreenPtr pScreen) +

References _DMXScreenInfo::beBlackPixel, _DMXScreenInfo::beBPP, _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDepth, _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, _DMXScreenInfo::beWhitePixel, dmxDPMSInit(), dmxPropertyWindow(), dmxScreens, dmxShadowFB, _DMXScreenInfo::noCursor, _DMXScreenInfo::scrnDefDrawables, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnWin, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _DMXScreenInfo::shadow, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

-

Variables

-int dmxGCPrivateIndex +

Referenced by dmxAttachScreen(), and dmxScreenInit().

-int dmxWinPrivateIndex +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
Bool dmxCloseScreen (int  idx,
ScreenPtr  pScreen 
)
+
+
+

Close screen number idx.

-int dmxFontPrivateIndex +

References _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, DMX_UNWRAP, dmxBECloseScreen(), dmxResetFonts(), dmxResetRender(), dmxScreens, dmxShadowFB, and _DMXScreenInfo::shadow.

-int dmxScreenPrivateIndex +

Referenced by dmxScreenInit().

-int dmxColormapPrivateIndex +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
static Bool dmxSaveScreen (ScreenPtr  pScreen,
int  what 
) [static]
+
+
-int dmxPictPrivateIndex +

References _DMXScreenInfo::beDisplay, dmxScreens, and dmxSync().

-int dmxGlyphSetPrivateIndex +

Referenced by dmxScreenInit().

- -

Detailed Description

-This file provides support for screen initialization.

Function Documentation

-

- - - - -
- - - - - - - - + + + +
+
+
void dmxBECloseScreen ( ScreenPtr  pScreen  ) 
+ + + + + - -
Bool dmxScreenInit (int  idx,
-
- - - - - -
-   - - -

-Close the pScreen resources on the back-end server.

-

- - - - -
- - - - - + + + + + + + + + + - - + + - - + + -
void dmxBEScreenInit ( int  idx, ScreenPtr  pScreen,
int  argc,
ScreenPtr  pScreenchar *  argv[] 
) )
-
- - - - - -
-   - - -

-Initialize the parts of screen idx that require access to the back-end server.

-

- - - - -
- + +
+

Initialize screen number idx.

+ +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDepths, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, _DMXScreenInfo::beXDPI, DMX_WRAP, dmxBEScreenInit(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeWindowAttributes(), dmxCloseScreen(), dmxCopyWindow(), dmxCreateColormap(), dmxCreateDefColormap(), dmxCreateGC(), dmxCreatePixmap(), dmxCreateWindow(), dmxCursorGeneration, dmxDestroyColormap(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxFontPrivateIndex, dmxGeneration, dmxGetImage(), dmxGetSpans(), dmxInitGC(), dmxInitPixmap(), dmxInitWindow(), dmxInstallColormap(), dmxPictureInit(), dmxPointerCursorFuncs, dmxPointerSpriteFuncs, dmxPositionWindow(), dmxRealizeFont(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxScreens, dmxSetShape(), dmxShadowFB, dmxShadowUpdateProc(), dmxStoreColors(), dmxUnrealizeFont(), dmxUnrealizeWindow(), dmxWindowExposures(), _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, and _DMXScreenInfo::shadow.

+ +

Referenced by InitOutput().

+ +
+ +

Variable Documentation

+ +
+
+
- - - - + +
Bool dmxCloseScreen ( int  idx, DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex
+ +
+

Private index for Colormaps

+ +
+ + +
+
+ - - - - + +
ScreenPtr  pScreenint dmxColormapPrivateKeyIndex [static]
+
+
+ +
+
+ +
+
+ - - - + +
) unsigned long* dmxCursorGeneration [static]
+
+
+ +

Referenced by dmxScreenInit().

+
+
+ +
+
+ + + +
int dmxFontPrivateIndex
-
- - - - - -
-   - - -

-Close screen number idx.

-

- - - - -
- + +
+

Private index for Fonts

+ +

Referenced by dmxBEFreeFont(), dmxBELoadFont(), dmxChangeGC(), dmxRealizeFont(), dmxScreenInit(), and dmxUnrealizeFont().

+ +
+ + +
+
+
- - - - + +
Bool dmxScreenInit ( int  idx, DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKeyIndex
+ +
+

Private index for GCs

+ +

Referenced by dmxInitGC().

+ +
+ + +
+
+ - - - - + +
ScreenPtr  pScreen, int dmxGCPrivateKeyIndex [static]
+
+
+ +
+
+ +
+
+ - - - - + +
int  argc, unsigned long dmxGeneration [static]
+
+
+ +

Referenced by dmxConsoleUpdatePosition(), dmxMakeUniqueDeviceName(), dmxScreenInit(), dmxSync(), and InitOutput().

+ +
+
+ +
+
+ - - - - + +
char *  argv[]DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex
+
+
+

Private index for GlyphSets

+ +
+
+ +
+
+ - - - + +
) int dmxGlyphSetPrivateKeyIndex [static]
+
+
+
+
+ +
+
+ + + +
DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex
-
- - - - - -
-   - - -

-Initialize screen number idx.

-

Variable Documentation

-

- - - +

Referenced by dmxSigioAdd(), and dmxSigioRemove().

- + + + +
+
+
- - - - -
int dmxColormapPrivateIndex + +
+

Private index for Picts

+ +

Referenced by dmxPictureInit().

+ +
+ + +
+
+ + + +
int dmxPictPrivateKeyIndex [static]
-
- - - - - -
-   - - -

-Private index for Colormaps

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int dmxFontPrivateIndex + DevPrivateKey dmxPixPrivateKey = &dmxPixPrivateKeyIndex
-
- - - - - -
-   - - -

-Private index for Fonts

-

- - - - -
- + +
+

Private index for Pixmaps

+ +

Referenced by dmxInitPixmap().

+ +
+ + +
+
+
- +
int dmxGCPrivateIndex + int dmxPixPrivateKeyIndex [static]
-
- - - - - -
-   - - -

-Private index for GCs

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int dmxGlyphSetPrivateIndex + DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex
-
- - - - - -
-   - - -

-Private index for GlyphSets

-

- - - - -
- + +
+

Private index for Screens

+ +

Referenced by dmxCloseConsoleScreen(), and dmxConsoleInit().

+ +
+ + +
+
+
- +
int dmxPictPrivateIndex + int dmxScreenPrivateKeyIndex [static]
-
- - - - - -
-   - - -

-Private index for Picts

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int dmxScreenPrivateIndex + DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKeyIndex
-
- - - - - -
-   - - -

-Private index for Screens

-

- - - - -
- + +
+

Private index for Windows

+ +

Referenced by dmxInitWindow().

+ +
+ + +
+
+
- +
int dmxWinPrivateIndex + int dmxWinPrivateKeyIndex [static]
-
- - - - - -
-   - - -

-Private index for Windows

+ +

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html deleted file mode 100644 index ab7b22fd3..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxscrinit.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *   David H. Dawes <dawes@xfree86.org>
-00033  *
-00034  */
-00035 
-00039 #ifndef DMXSCRINIT_H
-00040 #define DMXSCRINIT_H
-00041 
-00042 #include "scrnintstr.h"
-00043 
-00045 extern int dmxScreenPrivateIndex;
-00046 
-00047 extern Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]);
-00048 
-00049 extern void dmxBEScreenInit(int idx, ScreenPtr pScreen);
-00050 extern void dmxBECloseScreen(ScreenPtr pScreen);
-00051 
-00052 #endif /* DMXSCRINIT_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html index 72415ef97..66fbebc19 100644 --- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html @@ -6,167 +6,159 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxscrinit.h File Reference

#include "scrnintstr.h"
- -

-Go to the source code of this file. - - - - - - - - - - + + +
+

dmxscrinit.h File Reference

#include "scrnintstr.h"
+

Go to the source code of this file.

+

Functions

Bool dmxScreenInit (int idx, ScreenPtr pScreen, int argc, char *argv[])
void dmxBEScreenInit (int idx, ScreenPtr pScreen)
void dmxBECloseScreen (ScreenPtr pScreen)

Variables

int dmxScreenPrivateIndex
+ + + + + +

Functions

Bool dmxScreenInit (int idx, ScreenPtr pScreen, int argc, char *argv[])
void dmxBEScreenInit (int idx, ScreenPtr pScreen)
void dmxBECloseScreen (ScreenPtr pScreen)

Variables

DevPrivateKey dmxScreenPrivateKey
-

Detailed Description

-Interface for screen initialization.
See also:
dmxscrinit.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for screen initialization.

+
See also:
dmxscrinit.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxBECloseScreen ( ScreenPtr  pScreen  ) void dmxBECloseScreen (ScreenPtr  pScreen ) 
-
- - - - - -
-   - + +
+

Close the pScreen resources on the back-end server.

-

-Close the pScreen resources on the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, dmxDPMSTerm(), dmxScreens, dmxShadowFB, _DMXScreenInfo::noCursor, _DMXScreenInfo::scrnDefDrawables, _DMXScreenInfo::scrnWin, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

+ +

Referenced by dmxCloseScreen(), and dmxDetachScreen().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxBEScreenInit ( int  idx, void dmxBEScreenInit (int  idx,
ScreenPtr  pScreenScreenPtr  pScreen 
) )
-
- - - - - -
-   - + +
+

Initialize the parts of screen idx that require access to the back-end server.

-

-Initialize the parts of screen idx that require access to the back-end server.

-

- - - - -
- +

References _DMXScreenInfo::beBlackPixel, _DMXScreenInfo::beBPP, _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDepth, _DMXScreenInfo::beDepths, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumPixmapFormats, _DMXScreenInfo::bePixmapFormats, _DMXScreenInfo::beVisuals, _DMXScreenInfo::beWhitePixel, dmxDPMSInit(), dmxPropertyWindow(), dmxScreens, dmxShadowFB, _DMXScreenInfo::noCursor, _DMXScreenInfo::scrnDefDrawables, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnWin, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _DMXScreenInfo::shadow, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

+ +

Referenced by dmxAttachScreen(), and dmxScreenInit().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
Bool dmxScreenInit ( int  idx, Bool dmxScreenInit (int  idx,
ScreenPtr  pScreen, ScreenPtr  pScreen,
int  argc, int  argc,
char *  argv[]char *  argv[] 
) )
-
- - - - - -
-   - + +
+

Initialize screen number idx.

-

-Initialize screen number idx.

-

Variable Documentation

-

- - - - -
- +

References _DMXScreenInfo::beBPP, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDepths, _DMXScreenInfo::beNumDepths, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, _DMXScreenInfo::beXDPI, DMX_WRAP, dmxBEScreenInit(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeWindowAttributes(), dmxCloseScreen(), dmxCopyWindow(), dmxCreateColormap(), dmxCreateDefColormap(), dmxCreateGC(), dmxCreatePixmap(), dmxCreateWindow(), dmxCursorGeneration, dmxDestroyColormap(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxFontPrivateIndex, dmxGeneration, dmxGetImage(), dmxGetSpans(), dmxInitGC(), dmxInitPixmap(), dmxInitWindow(), dmxInstallColormap(), dmxPictureInit(), dmxPointerCursorFuncs, dmxPointerSpriteFuncs, dmxPositionWindow(), dmxRealizeFont(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxScreens, dmxSetShape(), dmxShadowFB, dmxShadowUpdateProc(), dmxStoreColors(), dmxUnrealizeFont(), dmxUnrealizeWindow(), dmxWindowExposures(), _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, and _DMXScreenInfo::shadow.

+ +

Referenced by InitOutput().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxScreenPrivateIndex + DevPrivateKey dmxScreenPrivateKey
-
- - - - - -
-   - + +
+

Private index.

+
See also:
dmxscrrinit.c
+
+input/dmxconcole.c
+

Private index for Screens

-

-Private index for Screens

+

Referenced by dmxCloseConsoleScreen(), and dmxConsoleInit().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html new file mode 100644 index 000000000..85c30ecb0 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html @@ -0,0 +1,83 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html index 0db2bfa8b..2d3980ba7 100644 --- a/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html @@ -6,57 +6,66 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxshadow.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxshadow.h"
- - - - - + + +
+

dmxshadow.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxshadow.h"
+

Functions

void dmxShadowUpdateProc (ScreenPtr pScreen, shadowBufPtr pBuf)
+ +

Functions

void dmxShadowUpdateProc (ScreenPtr pScreen, shadowBufPtr pBuf)
-

Detailed Description

-This file provides support for the shadow frame buffer.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support for the shadow frame buffer.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxShadowUpdateProc ( ScreenPtr  pScreen, void dmxShadowUpdateProc (ScreenPtr  pScreen,
shadowBufPtr  pBufshadowBufPtr  pBuf 
) )
-
- - - - - -
-   - + +
+

Update the screen from the shadow frame buffer.

-

-Update the screen from the shadow frame buffer.

+

References _DMXScreenInfo::beDisplay, dmxScreens, dmxSync(), _DMXScreenInfo::scrnWin, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

+ +

Referenced by dmxScreenInit().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html deleted file mode 100644 index 2253c350b..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxshadow.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *   David H. Dawes <dawes@xfree86.org>
-00033  *
-00034  */
-00035 
-00039 #ifndef DMXSHADOW_H
-00040 #define DMXSHADOW_H
-00041 
-00042 #include "shadow.h"
-00043 #include "scrnintstr.h"
-00044 
-00045 extern void dmxShadowUpdateProc(ScreenPtr pScreen, shadowBufPtr pBuf);
-00046 
-00047 #endif /* DMXSHADOW_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html index 05e148ad3..f2ab72b44 100644 --- a/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html @@ -6,59 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxshadow.h File Reference

#include "shadow.h"
-#include "scrnintstr.h"
- -

-Go to the source code of this file. - - - + + +
+

dmxshadow.h File Reference

#include "shadow.h"
+#include "scrnintstr.h"
+

Go to the source code of this file.

+

Functions

void dmxShadowUpdateProc (ScreenPtr pScreen, shadowBufPtr pBuf)
+ +

Functions

void dmxShadowUpdateProc (ScreenPtr pScreen, shadowBufPtr pBuf)
-

Detailed Description

-Interface for shadow framebuffer support.
See also:
dmxshadow.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for shadow framebuffer support.

+
See also:
dmxshadow.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxShadowUpdateProc ( ScreenPtr  pScreen, void dmxShadowUpdateProc (ScreenPtr  pScreen,
shadowBufPtr  pBufshadowBufPtr  pBuf 
) )
-
- - - - - -
-   - + +
+

Update the screen from the shadow frame buffer.

-

-Update the screen from the shadow frame buffer.

+

References _DMXScreenInfo::beDisplay, dmxScreens, dmxSync(), _DMXScreenInfo::scrnWin, _DMXScreenInfo::shadowFBImage, and _DMXScreenInfo::shadowGC.

+ +

Referenced by dmxScreenInit().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html new file mode 100644 index 000000000..3ba27ee62 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html @@ -0,0 +1,79 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html index 761748dae..71d42cb4a 100644 --- a/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html @@ -6,216 +6,367 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxsigio.c File Reference

#include "inputstr.h"
-#include "dmxinputinit.h"
-#include "dmxsigio.h"
-#include "dmxevents.h"
-#include <signal.h>
-#include <unistd.h>
-#include <sys/fcntl.h>
- - - - + + +
+

dmxsigio.c File Reference

#include "inputstr.h"
+#include "dmxinputinit.h"
+#include "dmxsigio.h"
+#include "dmxevents.h"
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+

Functions

void dmxSigioBlock (void)
+ + + + + + + + + + + + + + + + + + +

Defines

#define O_ASYNC   0
#define O_NONBLOCK   FNONBLK

Functions

static void dmxSigioHandler (int sig)
void dmxSigioBlock (void)
void dmxSigioUnblock (void)
static void dmxSigioHook (void)
static void dmxSigioUnhook (void)
static void dmxSigioAdd (DMXInputInfo *dmxInput)
static void dmxSigioRemove (DMXInputInfo *dmxInput)
void dmxSigioEnableInput (void)
void dmxSigioDisableInput (void)
void dmxSigioRegister (DMXInputInfo *dmxInput, int fd)
void dmxSigioUnregister (DMXInputInfo *dmxInput)

Variables

static int dmxFdCount = 0
static Bool dmxInputEnabled = TRUE
+

Detailed Description

+

Provides an interface for handling SIGIO signals for input devices.

+

Define Documentation

+ +
+
+ + + + +
#define O_ASYNC   0
+
+
-
void dmxSigioUnblock (void)
void dmxSigioEnableInput (void)
+ + + +
#define O_NONBLOCK   FNONBLK
+

+
-void dmxSigioDisableInput (void) +

Referenced by dmxSigioAdd(), dmxSigioRemove(), kbdLinuxOpenVT(), msLinuxInit(), ps2LinuxInit(), and usbInit().

-void dmxSigioRegister (DMXInputInfo *dmxInput, int fd) +
+
+

Function Documentation

+ +
+
+ + + + + + + + + +
static void dmxSigioAdd (DMXInputInfo *  dmxInput )  [static]
+
+
-void dmxSigioUnregister (DMXInputInfo *dmxInput) +

References DMX_ACTIVESIGIO, DMX_NOSIGIO, DMX_USESIGIO, dmxFdCount, dmxSigioHook(), O_ASYNC, O_NONBLOCK, _DMXInputInfo::sigioAdded, _DMXInputInfo::sigioFd, _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

- -

Detailed Description

-Provides an interface for handling SIGIO signals for input devices.

Function Documentation

-

- - - - -
- - - - - - - - - +

Referenced by dmxSigioEnableInput(), and dmxSigioRegister().

+ + + +
+
+
void dmxSigioBlock ( void   ) 
+ + + + + + + +
void dmxSigioBlock (void  ) 
-
- - - - - -
-   - - -

-Block SIGIO handling.

-

- - - - -
- + +
+

Block SIGIO handling.

+ +

Referenced by dmxCoreMotion(), dmxExtMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxSigioDisableInput ( void   ) void dmxSigioDisableInput (void  ) 
+ +
+

Disable SIGIO handling. This removes the hanlder from the OS.

+ +

References dmxInputEnabled, dmxInputs, dmxNumInputs, and dmxSigioRemove().

+

Referenced by dmxWakeupHandler().

+ +
+ + +
+
+ + + + + + + + +
void dmxSigioEnableInput (void  ) 
-
- - - - - -
-   - - -

-Disable SIGIO handling. This removes the hanlder from the OS.

-

- - - - -
- + +
+

Enable SIGIO handling. This instantiates the handler with the OS.

+ +

References dmxInputEnabled, dmxInputs, dmxNumInputs, and dmxSigioAdd().

+ +

Referenced by dmxSwitchReturn().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void dmxSigioEnableInput ( void   ) static void dmxSigioHandler (int  sig )  [static]
+ +
+ +

References _DMXLocalInputInfo::collect_events, _DMXInputInfo::devs, DMX_ACTIVESIGIO, DMX_NO_BLOCK, dmxCheckSpecialKeys(), dmxEnqueue(), dmxInputs, dmxMotion(), dmxNumInputs, _DMXInputInfo::numDevs, _DMXLocalInputInfo::pDevice, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxSigioHook().

+
+ + +
+
+ + + + + + + + +
static void dmxSigioHook (void  )  [static]
-
- - - - - -
-   - - -

-Enable SIGIO handling. This instantiates the handler with the OS.

-

- - - - -
- + +
+ +

References dmxSigioHandler().

+ +

Referenced by dmxSigioAdd().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + +
void dmxSigioRegister ( DMXInputInfo *  dmxInput, void dmxSigioRegister (DMXInputInfo *  dmxInput,
int  fdint  fd 
) )
+ +
+

Make a note that the input device described in dmxInput will be using the file descriptor fd for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with dmxSigioEnableInput().

+

References DMX_MAX_SIGIO_FDS, DMX_USESIGIO, dmxFatal, dmxInputEnabled, dmxLog(), dmxSigioAdd(), _DMXInputInfo::sigioFd, _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+ + + + + + + + +
static void dmxSigioRemove (DMXInputInfo *  dmxInput )  [static]
-
- - - - - -
-   - - -

-Make a note that the input device described in dmxInput will be using the file descriptor fd for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with dmxSigioEnableInput().

-

- - - - -
- + +
+ +

References DMX_ACTIVESIGIO, DMX_NOSIGIO, DMX_USESIGIO, dmxFdCount, dmxSigioUnhook(), O_ASYNC, O_NONBLOCK, _DMXInputInfo::sigioAdded, _DMXInputInfo::sigioFd, _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxSigioDisableInput(), and dmxSigioUnregister().

+ +
+ + +
+
+
+ + + + + + + + +
void dmxSigioUnblock (void  ) 
+ +
+

Unblock SIGIO handling.

+ +

Referenced by dmxCoreMotion(), dmxExtMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+ - - - - - - + + + + + + +
void dmxSigioUnblock ( void   ) static void dmxSigioUnhook (void  )  [static]
+
+
+ +

Referenced by dmxSigioRemove().

+
+
+ +
+
+ + + + + + + + +
void dmxSigioUnregister (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Unblock SIGIO handling.

-

- - - - -
- + +
+

Remove the notes that dmxInput is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.

+ +

References DMX_NOSIGIO, dmxSigioRemove(), _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxDeviceOnOff().

+ +
+ +

Variable Documentation

+ +
+
+
- - - - - - + +
void dmxSigioUnregister ( DMXInputInfo *  dmxInput  ) int dmxFdCount = 0 [static]
+ +
+ +

Referenced by dmxSigioAdd(), and dmxSigioRemove().

+
+ + +
+
+ + + +
Bool dmxInputEnabled = TRUE [static]
-
- - - - - -
-   - - -

-Remove the notes that dmxInput is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.

+

+
+ +

Referenced by dmxSigioDisableInput(), dmxSigioEnableInput(), and dmxSigioRegister().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html deleted file mode 100644 index 4f41eb80e..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxsigio.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXSIGIO_H_
-00039 #define _DMXSIGIO_H_
-00040 extern void dmxSigioBlock(void);
-00041 extern void dmxSigioUnblock(void);
-00042 extern void dmxSigioEnableInput(void);
-00043 extern void dmxSigioDisableInput(void);
-00044 extern void dmxSigioRegister(DMXInputInfo *dmxInput, int fd);
-00045 extern void dmxSigioUnregister(DMXInputInfo *dmxInput);
-00046 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html index 1e55b7b83..7353f4fbe 100644 --- a/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html @@ -6,212 +6,182 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxsigio.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxSigioBlock (void)
void dmxSigioUnblock (void)
void dmxSigioEnableInput (void)
void dmxSigioDisableInput (void)
void dmxSigioRegister (DMXInputInfo *dmxInput, int fd)
void dmxSigioUnregister (DMXInputInfo *dmxInput)
+ + + + + + +

Functions

void dmxSigioBlock (void)
void dmxSigioUnblock (void)
void dmxSigioEnableInput (void)
void dmxSigioDisableInput (void)
void dmxSigioRegister (DMXInputInfo *dmxInput, int fd)
void dmxSigioUnregister (DMXInputInfo *dmxInput)
-

Detailed Description

-Interface to SIGIO handling support.
See also:
dmxsigio.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to SIGIO handling support.

+
See also:
dmxsigio.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void dmxSigioBlock ( void   ) void dmxSigioBlock (void  ) 
-
- - - - - -
-   - - -

-Block SIGIO handling.

-

- - - - -
- + +
+

Block SIGIO handling.

+ +

Referenced by dmxCoreMotion(), dmxExtMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSigioDisableInput ( void   ) void dmxSigioDisableInput (void  ) 
-
- - - - - -
-   - - -

-Disable SIGIO handling. This removes the hanlder from the OS.

-

- - - - -
- + +
+

Disable SIGIO handling. This removes the hanlder from the OS.

+ +

References dmxInputEnabled, dmxInputs, dmxNumInputs, and dmxSigioRemove().

+ +

Referenced by dmxWakeupHandler().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSigioEnableInput ( void   ) void dmxSigioEnableInput (void  ) 
-
- - - - - -
-   - - -

-Enable SIGIO handling. This instantiates the handler with the OS.

-

- - - - -
- + +
+

Enable SIGIO handling. This instantiates the handler with the OS.

+ +

References dmxInputEnabled, dmxInputs, dmxNumInputs, and dmxSigioAdd().

+ +

Referenced by dmxSwitchReturn().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxSigioRegister ( DMXInputInfo *  dmxInput, void dmxSigioRegister (DMXInputInfo *  dmxInput,
int  fdint  fd 
) )
-
- - - - - -
-   - - -

-Make a note that the input device described in dmxInput will be using the file descriptor fd for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with dmxSigioEnableInput().

-

- - - - -
- + +
+

Make a note that the input device described in dmxInput will be using the file descriptor fd for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with dmxSigioEnableInput().

+ +

References DMX_MAX_SIGIO_FDS, DMX_USESIGIO, dmxFatal, dmxInputEnabled, dmxLog(), dmxSigioAdd(), _DMXInputInfo::sigioFd, _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSigioUnblock ( void   ) void dmxSigioUnblock (void  ) 
-
- - - - - -
-   - - -

-Unblock SIGIO handling.

-

- - - - -
- + +
+

Unblock SIGIO handling.

+ +

Referenced by dmxCoreMotion(), dmxExtMotion(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSigioUnregister ( DMXInputInfo *  dmxInput  ) void dmxSigioUnregister (DMXInputInfo *  dmxInput ) 
-
- - - - - -
-   - - -

-Remove the notes that dmxInput is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.

+

+
+

Remove the notes that dmxInput is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.

+ +

References DMX_NOSIGIO, dmxSigioRemove(), _DMXInputInfo::sigioFdCount, and _DMXInputInfo::sigioState.

+ +

Referenced by dmxDeviceOnOff().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html new file mode 100644 index 000000000..966734f44 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html @@ -0,0 +1,78 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8c.html b/xorg-server/hw/dmx/doc/html/dmxstat_8c.html index 9a9ecfc65..5add0d023 100644 --- a/xorg-server/hw/dmx/doc/html/dmxstat_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxstat_8c.html @@ -6,260 +6,384 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxstat.c File Reference

#include "dmx.h"
-#include "dmxstat.h"
-#include "dmxlog.h"
-#include "Xos.h"
- - - - - - - - - + + +
+

dmxstat.c File Reference

#include "dmx.h"
+#include "dmxstat.h"
+#include "dmxlog.h"
+#include <X11/Xos.h>
+

Data Structures

struct  _DMXStatAvg
struct  _DMXStatInfo

Typedefs

typedef _DMXStatAvg DMXStatAvg
+ + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _DMXStatAvg
struct  _DMXStatInfo

Typedefs

typedef struct _DMXStatAvg DMXStatAvg

Functions

static unsigned long usec (struct timeval *stop, struct timeval *start)
static unsigned long avg (DMXStatAvg *data, unsigned long *max)
void dmxStatActivate (const char *interval, const char *displays)
DMXStatInfo * dmxStatAlloc (void)
void dmxStatFree (DMXStatInfo *pt)
static void dmxStatValue (DMXStatAvg *data, unsigned long value)
void dmxStatSync (DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)
static CARD32 dmxStatCallback (OsTimerPtr timer, CARD32 t, pointer arg)
void dmxStatInit (void)

Variables

int dmxStatInterval
static int dmxStatDisplays
static OsTimerPtr dmxStatTimer
+

Detailed Description

+

The DMX server code is written to call dmxSync() whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided in dmxsync.c. This file provides routines that evaluate this optimization by counting the number of XSync() calls and monitoring their latency. This functionality can be turned on using the -stat command-line parameter.

+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _DMXStatAvg DMXStatAvg
+
+
+

Used to compute a running average of value.

-

Functions

-void dmxStatActivate (const char *interval, const char *displays) +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
static unsigned long avg (DMXStatAvg *  data,
unsigned long *  max 
) [static]
+
+
-DMXStatInfo * dmxStatAlloc (void) +

References _DMXStatAvg::count, and _DMXStatAvg::value.

-void dmxStatFree (DMXStatInfo *pt) +

Referenced by dmxStatCallback().

-void dmxStatSync (DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void dmxStatActivate (const char *  interval,
const char *  displays 
)
+
+
+

Turn on XSync statistic gathering and printing. Print every interval seconds, with lines for the first displays. If interval is NULL, 1 will be used. If displays is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from ddxProcessArgument in dmxinit.c.

-void dmxStatInit (void) +

References dmxStatDisplays, and dmxStatInterval.

-

Variables

-int dmxStatInterval +

Referenced by ddxProcessArgument().

- -

Detailed Description

-The DMX server code is written to call dmxSync() whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided in #dmxsync.c. This file provides routines that evaluate this optimization by counting the number of XSync() calls and monitoring their latency. This functionality can be turned on using the -stat command-line parameter.

Typedef Documentation

-

- - - - -
- + + + +
+
+
- + + + + + +
typedef struct _DMXStatAvg DMXStatAvg + DMXStatInfo* dmxStatAlloc (void  ) 
-
- - - - - -
-   - + +
+

Allocate a DMXStatInfo structure.

-

-Used to compute a running average of value.

-

Function Documentation

-

- - - - -
- +

Referenced by dmxConfigAddDisplay().

+ + + + +
+
+
- - - - + + + + + + + + + + - - + + - - + + -
void dmxStatActivate ( const char *  interval, static CARD32 dmxStatCallback (OsTimerPtr  timer,
CARD32  t,
const char *  displayspointer  arg 
) ) [static]
-
- - - - - -
-   - + +
-

-Turn on XSync statistic gathering and printing. Print every interval seconds, with lines for the first displays. If interval is NULL, 1 will be used. If displays is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from ddxProcessArgument in #dmxinit.c.

-

- - - - -
- - - - - - - - - +

References avg(), _DMXStatInfo::bins, DMX_STAT_BINS, DMX_STAT_INTERVAL, dmxDebug, dmxLog(), dmxLogCont(), dmxNumScreens, dmxScreens, dmxStatDisplays, dmxStatInterval, _DMXStatInfo::oldSyncCount, _DMXStatInfo::pending, _DMXScreenInfo::stat, _DMXStatInfo::syncCount, and _DMXStatInfo::usec.

-
DMXStatInfo* dmxStatAlloc ( void   ) 
-
- - - - - -
-   - +

Referenced by dmxStatInit().

-

-Allocate a DMXStatInfo structure.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + -
void dmxStatFree ( DMXStatInfo *  pt  ) void dmxStatFree (DMXStatInfo *  pt ) 
-
- - - - - -
-   - + +
+

Free the memory used by a DMXStatInfo structure.

-

-Free the memory used by a DMXStatInfo structure.

-

- - - - -
- +

Referenced by InitOutput().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxStatInit ( void   ) void dmxStatInit (void  ) 
-
- - - - - -
-   - + +
+

Try to initialize the statistic gathering and printing routines. Initialization only takes place if dmxStatActivate has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.

-

-Try to initialize the statistic gathering and printing routines. Initialization only takes place if dmxStatActivate has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.

-

- - - - -
- +

References dmxStatCallback(), dmxStatInterval, and dmxStatTimer.

+ +

Referenced by InitOutput().

+ + + + +
+
+
- - - - + + + + + + + + + + + + + + + + - - + + + + + +
void dmxStatSync ( DMXScreenInfo *  dmxScreen, void dmxStatSync (DMXScreenInfo *  dmxScreen,
struct timeval *  stop,
struct timeval *  start,
struct timeval *  stop, unsigned long  pending 
)
+ +
+

Note that a XSync() was just done on dmxScreen with the start and stop times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from dmxDoSync in dmxsync.c

+ +

References _DMXStatInfo::bins, DMX_STAT_BIN0, DMX_STAT_BINMULT, DMX_STAT_BINS, dmxStatValue(), _DMXStatInfo::pending, _DMXScreenInfo::stat, _DMXStatInfo::syncCount, _DMXStatInfo::usec, and usec().

+ +

Referenced by dmxDoSync().

+ +
+ + +
+
+ + + + + + + + + - - + + + + + +
static void dmxStatValue (DMXStatAvg *  data,
struct timeval *  start, unsigned long  value 
) [static]
+
+
+ +

References _DMXStatAvg::count, DMX_STAT_LENGTH, _DMXStatAvg::pos, and _DMXStatAvg::value.

+ +

Referenced by dmxStatSync().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static unsigned long usec (struct timeval *  stop,
unsigned long  pendingstruct timeval *  start 
) ) [static]
+
+
+

Return the number of microseconds as an unsigned long. Unfortunately, this is only useful for intervals < about 4 sec.

+ +

Referenced by dmxStatSync().

+
+
+

Variable Documentation

+ +
+
+ + + +
int dmxStatDisplays [static]
-
- - - - - -
-   - + +
-

-Note that a XSync() was just done on dmxScreen with the start and stop times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from #dmxDoSync in #dmxsync.c

-

Variable Documentation

-

- - - - -
- +

Referenced by dmxStatActivate(), and dmxStatCallback().

+ + + + +
+
+
- +
int dmxStatInterval + int dmxStatInterval
-
- - - - - -
-   - + +
+

Only for dmxstat.c and dmxsync.c

-

-Only for dmxstat.c and dmxsync.c

+

Referenced by dmxDoSync(), dmxStatActivate(), dmxStatCallback(), and dmxStatInit().

+ +
+
+ +
+
+ + + + +
OsTimerPtr dmxStatTimer [static]
+
+
+ +

Referenced by dmxStatInit().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html deleted file mode 100644 index d7579a5d8..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxstat.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXSTAT_H_
-00039 #define _DMXSTAT_H_
-00040 
-00041 #define DMX_STAT_LENGTH     10  
-00042 #define DMX_STAT_INTERVAL 1000  
-00043 #define DMX_STAT_BINS        3  
-00044 #define DMX_STAT_BIN0    10000  
-00045 #define DMX_STAT_BINMULT   100  
-00047 extern int         dmxStatInterval; 
-00048 extern void        dmxStatActivate(const char *interval, const char *displays);
-00049 extern DMXStatInfo *dmxStatAlloc(void);
-00050 extern void        dmxStatFree(DMXStatInfo *);
-00051 extern void        dmxStatInit(void);
-00052 extern void        dmxStatSync(DMXScreenInfo *dmxScreen,
-00053                                struct timeval *stop, struct timeval *start,
-00054                                unsigned long pending);
-00055 
-00056 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h.html index d4fcb0d9c..6e04e6529 100644 --- a/xorg-server/hw/dmx/doc/html/dmxstat_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxstat_8h.html @@ -6,350 +6,285 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxstat.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Defines

#define DMX_STAT_LENGTH   10
#define DMX_STAT_INTERVAL   1000
#define DMX_STAT_BINS   3
#define DMX_STAT_BIN0   10000
#define DMX_STAT_BINMULT   100

Functions

void dmxStatActivate (const char *interval, const char *displays)
DMXStatInfo * dmxStatAlloc (void)
void dmxStatFree (DMXStatInfo *)
void dmxStatInit (void)
void dmxStatSync (DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)

Variables

int dmxStatInterval
+ + + + + + + + + + + + + +

Defines

#define DMX_STAT_LENGTH   10
#define DMX_STAT_INTERVAL   1000
#define DMX_STAT_BINS   3
#define DMX_STAT_BIN0   10000
#define DMX_STAT_BINMULT   100

Functions

void dmxStatActivate (const char *interval, const char *displays)
DMXStatInfo * dmxStatAlloc (void)
void dmxStatFree (DMXStatInfo *)
void dmxStatInit (void)
void dmxStatSync (DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)

Variables

int dmxStatInterval
-

Detailed Description

-Interface for statistic gathering interface.
See also:
dmxstat.c
-

Define Documentation

-

- - - - -
- +

Detailed Description

+

Interface for statistic gathering interface.

+
See also:
dmxstat.c
+

Define Documentation

+ +
+
+
- +
#define DMX_STAT_BIN0   10000 + #define DMX_STAT_BIN0   10000
-
- - - - - -
-   - + +
+

us for bin[0]

-

-us for bin[0]

-

- - - - -
- +

Referenced by dmxStatSync().

+ + + + +
+
+
- +
#define DMX_STAT_BINMULT   100 + #define DMX_STAT_BINMULT   100
-
- - - - - -
-   - + +
+

multiplier for next bin[]

-

-multiplier for next bin[]

-

- - - - -
- +

Referenced by dmxStatSync().

+ + + + +
+
+
- +
#define DMX_STAT_BINS   3 + #define DMX_STAT_BINS   3
-
- - - - - -
-   - + +
+

number of bins

-

-number of bins

-

- - - - -
- +

Referenced by dmxStatCallback(), and dmxStatSync().

+ + + + +
+
+
- +
#define DMX_STAT_INTERVAL   1000 + #define DMX_STAT_INTERVAL   1000
-
- - - - - -
-   - + +
+

msec between printouts

-

-msec between printouts

-

- - - - -
- +

Referenced by dmxStatCallback().

+ + + + +
+
+
- +
#define DMX_STAT_LENGTH   10 + #define DMX_STAT_LENGTH   10
-
- - - - - -
-   - + +
+

number of events for moving average

-

-number of events for moving average

-

Function Documentation

-

- - - - -
- +

Referenced by dmxStatValue().

+ + + +

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxStatActivate ( const char *  interval, void dmxStatActivate (const char *  interval,
const char *  displaysconst char *  displays 
) )
-
- - - - - -
-   - + +
+

Turn on XSync statistic gathering and printing. Print every interval seconds, with lines for the first displays. If interval is NULL, 1 will be used. If displays is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from ddxProcessArgument in dmxinit.c.

-

-Turn on XSync statistic gathering and printing. Print every interval seconds, with lines for the first displays. If interval is NULL, 1 will be used. If displays is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from ddxProcessArgument in #dmxinit.c.

-

- - - - -
- +

References dmxStatDisplays, and dmxStatInterval.

+ +

Referenced by ddxProcessArgument().

+ + + + +
+
+
- - - - - - + + + + + + -
DMXStatInfo* dmxStatAlloc ( void   ) DMXStatInfo* dmxStatAlloc (void  ) 
-
- - - - - -
-   - + +
+

Allocate a DMXStatInfo structure.

-

-Allocate a DMXStatInfo structure.

-

- - - - -
- +

Referenced by dmxConfigAddDisplay().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxStatFree ( DMXStatInfo *  pt  ) void dmxStatFree (DMXStatInfo *  pt ) 
-
- - - - - -
-   - + +
+

Free the memory used by a DMXStatInfo structure.

-

-Free the memory used by a DMXStatInfo structure.

-

- - - - -
- +

Referenced by InitOutput().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxStatInit ( void   ) void dmxStatInit (void  ) 
-
- - - - - -
-   - + +
+

Try to initialize the statistic gathering and printing routines. Initialization only takes place if dmxStatActivate has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.

-

-Try to initialize the statistic gathering and printing routines. Initialization only takes place if dmxStatActivate has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.

-

- - - - -
- +

References dmxStatCallback(), dmxStatInterval, and dmxStatTimer.

+ +

Referenced by InitOutput().

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxStatSync ( DMXScreenInfo *  dmxScreen, void dmxStatSync (DMXScreenInfo *  dmxScreen,
struct timeval *  stop, struct timeval *  stop,
struct timeval *  start, struct timeval *  start,
unsigned long  pendingunsigned long  pending 
) )
-
- - - - - -
-   - + +
+

Note that a XSync() was just done on dmxScreen with the start and stop times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from dmxDoSync in dmxsync.c

-

-Note that a XSync() was just done on dmxScreen with the start and stop times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from #dmxDoSync in #dmxsync.c

-

Variable Documentation

-

- - - - -
- +

References _DMXStatInfo::bins, DMX_STAT_BIN0, DMX_STAT_BINMULT, DMX_STAT_BINS, dmxStatValue(), _DMXStatInfo::pending, _DMXScreenInfo::stat, _DMXStatInfo::syncCount, _DMXStatInfo::usec, and usec().

+ +

Referenced by dmxDoSync().

+ + + +

Variable Documentation

+ +
+
+
- +
int dmxStatInterval + int dmxStatInterval
-
- - - - - -
-   - + +
+

Only for dmxstat.c and dmxsync.c

-

-Only for dmxstat.c and dmxsync.c

+

Referenced by dmxDoSync(), dmxStatActivate(), dmxStatCallback(), and dmxStatInit().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html new file mode 100644 index 000000000..8b2aa4c7b --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html @@ -0,0 +1,87 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8c.html b/xorg-server/hw/dmx/doc/html/dmxsync_8c.html index 76a940dd9..6db2aeb60 100644 --- a/xorg-server/hw/dmx/doc/html/dmxsync_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxsync_8c.html @@ -6,125 +6,305 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxsync.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxstat.h"
-#include "dmxlog.h"
-#include <sys/time.h>
- - - - - - - - - + + +
+

dmxsync.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxstat.h"
+#include "dmxlog.h"
+#include <sys/time.h>
+

Functions

void dmxSyncActivate (const char *interval)
void dmxSyncInit (void)
void dmxSync (DMXScreenInfo *dmxScreen, Bool now)
+ + + + + + + + + + + +

Functions

static void dmxDoSync (DMXScreenInfo *dmxScreen)
static CARD32 dmxSyncCallback (OsTimerPtr timer, CARD32 time, pointer arg)
static void dmxSyncBlockHandler (pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
static void dmxSyncWakeupHandler (pointer blockData, int result, pointer pReadMask)
void dmxSyncActivate (const char *interval)
void dmxSyncInit (void)
void dmxSync (DMXScreenInfo *dmxScreen, Bool now)

Variables

static int dmxSyncInterval = 100
static OsTimerPtr dmxSyncTimer
static int dmxSyncPending
-

Detailed Description

-The DMX server code is written to call dmxSync() whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided here. Statistics about XSync() calls and latency are gathered in #dmxstat.c.

-During the initial conversion from calling XSync() immediately to the XSync() batching method implemented in this file, it was noted that, out of more than 300 x11perf tests, 8 tests became more than 100 times faster, with 68 more than 50X faster, 114 more than 10X faster, and 181 more than 2X faster.

Function Documentation

-

- - - - -
- +

Detailed Description

+

The DMX server code is written to call dmxSync() whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided here. Statistics about XSync() calls and latency are gathered in dmxstat.c.

+

During the initial conversion from calling XSync() immediately to the XSync() batching method implemented in this file, it was noted that, out of more than 300 x11perf tests, 8 tests became more than 100 times faster, with 68 more than 50X faster, 114 more than 10X faster, and 181 more than 2X faster.

+

Function Documentation

+ +
+
+
+ + + + + + + + +
static void dmxDoSync (DMXScreenInfo *  dmxScreen )  [static]
+ +
+ +

References _DMXScreenInfo::beDisplay, dmxStatInterval, dmxStatSync(), dmxSyncPending, and _DMXScreenInfo::needsSync.

+ +

Referenced by dmxSync(), and dmxSyncCallback().

+ +
+ + +
+
+ - - - - + + + + + + + + + - - + + +
void dmxSync ( DMXScreenInfo *  dmxScreen, void dmxSync (DMXScreenInfo *  dmxScreen,
Bool  now 
Bool  now)
+
+
+

Request an XSync() to the display used by dmxScreen. If now is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with dmxSyncActivate() before dmxSyncInit() was called, then no XSync() batching is performed and this function always calles XSync() immediately.

+

(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)

+

If dmxScreen is NULL, then all pending syncs will be flushed immediately.

+ +

References dmxDoSync(), dmxFatal, dmxGeneration, dmxLog(), dmxSyncCallback(), dmxSyncInterval, dmxSyncPending, dmxSyncTimer, _DMXScreenInfo::name, and _DMXScreenInfo::needsSync.

+ +

Referenced by _dmxMoveCursor(), _dmxSetCursor(), dmxAddInput(), dmxAttachScreen(), dmxBackendCollectEvents(), dmxBackendProcessInput(), dmxBackendUpdatePosition(), dmxBECreateCursor(), dmxBECreatePixmap(), dmxBELoadFont(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeGC(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCheckFontPath(), dmxCheckFontPathElement(), dmxCommonMouOn(), dmxCommonSaveState(), dmxComposite(), dmxCompositeRects(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxCopyArea(), dmxCopyPlane(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateWindow(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxDPMSInit(), dmxDPMSTerm(), dmxFillPolygon(), dmxFlushPendingSyncs(), dmxGetImage(), dmxImageText16(), dmxImageText8(), dmxInstallColormap(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPositionWindow(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxPutImage(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeScreenWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxSetFontPath(), dmxSetShape(), dmxShadowUpdateProc(), dmxStoreColors(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxUnrealizeWindow(), dmxValidatePicture(), and dmxWindowExposures().

+ +
+
+ +
+
+ + + + + + - - +
void dmxSyncActivate (const char *  interval )  ) 
+
+
+

Request the XSync() batching optimization with the specified interval (in mS). If the interval is 0, 100mS is used. If the interval is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).

+

Note that the parameter to this routine is a string, since it will usually be called from ddxProcessArgument in dmxinit.c

+ +

References dmxSyncInterval.

+

Referenced by ddxProcessArgument().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static void dmxSyncBlockHandler (pointer  blockData,
OSTimePtr  pTimeout,
pointer  pReadMask 
) [static]
-
- - - - - -
-   - - -

-Request an XSync() to the display used by dmxScreen. If now is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with dmxSyncActivate() before dmxSyncInit() was called, then no XSync() batching is performed and this function always calles XSync() immediately.

-(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)

-If dmxScreen is NULL, then all pending syncs will be flushed immediately.

-

- - - - -
- + +
+ +

References dmxSyncTimer.

+ +

Referenced by dmxSyncInit().

+ +
+ + +
+
+
+ + + + + + + + + + + + - - - - - - + + + + + + + + + +
static CARD32 dmxSyncCallback (OsTimerPtr  timer,
CARD32  time,
void dmxSyncActivate ( const char *  interval  ) pointer  arg 
) [static]
+ +
+ +

References dmxDoSync(), dmxNumScreens, dmxScreens, dmxSyncPending, and _DMXScreenInfo::needsSync.

+

Referenced by dmxSync().

+ +
+ + +
+
+ + + + + + + + +
void dmxSyncInit (void  ) 
-
- - - - - -
-   - - -

-Request the XSync() batching optimization with the specified interval (in mS). If the interval is 0, 100mS is used. If the interval is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).

-Note that the parameter to this routine is a string, since it will usually be called from ddxProcessArgument in #dmxinit.c

-

- - - - -
- + +
+

Initialize the XSync() batching optimization, but only if dmxSyncActivate was last called with a non-negative value.

+ +

References dmxInfo, dmxLog(), dmxSyncBlockHandler(), dmxSyncInterval, and dmxSyncWakeupHandler().

+ +

Referenced by InitOutput().

+ +
+ + +
+
+
+ + + + + + + + + + + + - - - - - - + + + + + + + + + +
static void dmxSyncWakeupHandler (pointer  blockData,
int  result,
void dmxSyncInit ( void   ) pointer  pReadMask 
) [static]
+ +
+ +

Referenced by dmxSyncInit().

+
+ +

Variable Documentation

+ +
+
+ + + +
int dmxSyncInterval = 100 [static]
-
- - - - - -
-   - - -

-Initialize the XSync() batching optimization, but only if dmxSyncActivate was last called with a non-negative value.

+ +

+ +

Referenced by dmxSync(), dmxSyncActivate(), and dmxSyncInit().

+ +
+ + +
+
+ + + + +
int dmxSyncPending [static]
+
+
+ +

Referenced by dmxDoSync(), dmxSync(), and dmxSyncCallback().

+ +
+
+ +
+
+ + + + +
OsTimerPtr dmxSyncTimer [static]
+
+
+ +

Referenced by dmxSync(), and dmxSyncBlockHandler().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html deleted file mode 100644 index a8c4f0d11..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxsync.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _DMXSYNC_H_
-00039 #define _DMXSYNC_H_
-00040 
-00041 extern void dmxSyncActivate(const char *interval);
-00042 extern void dmxSyncInit(void);
-00043 extern void dmxSync(DMXScreenInfo *dmxScreen, Bool now);
-00044 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h.html index 53edcef9c..b5cbb77a3 100644 --- a/xorg-server/hw/dmx/doc/html/dmxsync_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxsync_8h.html @@ -6,122 +6,117 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

dmxsync.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

void dmxSyncActivate (const char *interval)
void dmxSyncInit (void)
void dmxSync (DMXScreenInfo *dmxScreen, Bool now)
+ + + +

Functions

void dmxSyncActivate (const char *interval)
void dmxSyncInit (void)
void dmxSync (DMXScreenInfo *dmxScreen, Bool now)
-

Detailed Description

-Interface for sync support.
See also:
dmxsync.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for sync support.

+
See also:
dmxsync.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxSync ( DMXScreenInfo *  dmxScreen, void dmxSync (DMXScreenInfo *  dmxScreen,
Bool  nowBool  now 
) )
-
- - - - - -
-   - + +
+

Request an XSync() to the display used by dmxScreen. If now is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with dmxSyncActivate() before dmxSyncInit() was called, then no XSync() batching is performed and this function always calles XSync() immediately.

+

(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)

+

If dmxScreen is NULL, then all pending syncs will be flushed immediately.

-

-Request an XSync() to the display used by dmxScreen. If now is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with dmxSyncActivate() before dmxSyncInit() was called, then no XSync() batching is performed and this function always calles XSync() immediately.

-(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)

-If dmxScreen is NULL, then all pending syncs will be flushed immediately.

-

- - - - -
- +

References dmxDoSync(), dmxFatal, dmxGeneration, dmxLog(), dmxSyncCallback(), dmxSyncInterval, dmxSyncPending, dmxSyncTimer, _DMXScreenInfo::name, and _DMXScreenInfo::needsSync.

+ +

Referenced by _dmxMoveCursor(), _dmxSetCursor(), dmxAddInput(), dmxAttachScreen(), dmxBackendCollectEvents(), dmxBackendProcessInput(), dmxBackendUpdatePosition(), dmxBECreateCursor(), dmxBECreatePixmap(), dmxBELoadFont(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeGC(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCheckFontPath(), dmxCheckFontPathElement(), dmxCommonMouOn(), dmxCommonSaveState(), dmxComposite(), dmxCompositeRects(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxCopyArea(), dmxCopyPlane(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateWindow(), dmxDestroyPicture(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDestroyWindow(), dmxDPMSInit(), dmxDPMSTerm(), dmxFillPolygon(), dmxFlushPendingSyncs(), dmxGetImage(), dmxImageText16(), dmxImageText8(), dmxInstallColormap(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPositionWindow(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxPutImage(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeScreenWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSaveScreen(), dmxSetFontPath(), dmxSetShape(), dmxShadowUpdateProc(), dmxStoreColors(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxUnrealizeWindow(), dmxValidatePicture(), and dmxWindowExposures().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxSyncActivate ( const char *  interval  ) void dmxSyncActivate (const char *  interval ) 
-
- - - - - -
-   - + +
+

Request the XSync() batching optimization with the specified interval (in mS). If the interval is 0, 100mS is used. If the interval is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).

+

Note that the parameter to this routine is a string, since it will usually be called from ddxProcessArgument in dmxinit.c

-

-Request the XSync() batching optimization with the specified interval (in mS). If the interval is 0, 100mS is used. If the interval is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).

-Note that the parameter to this routine is a string, since it will usually be called from ddxProcessArgument in #dmxinit.c

-

- - - - -
- +

References dmxSyncInterval.

+ +

Referenced by ddxProcessArgument().

+ + + + +
+
+
- - - - - - + + + + + + -
void dmxSyncInit ( void   ) void dmxSyncInit (void  ) 
-
- - - - - -
-   - + +
+

Initialize the XSync() batching optimization, but only if dmxSyncActivate was last called with a non-negative value.

-

-Initialize the XSync() batching optimization, but only if dmxSyncActivate was last called with a non-negative value.

+

References dmxInfo, dmxLog(), dmxSyncBlockHandler(), dmxSyncInterval, and dmxSyncWakeupHandler().

+ +

Referenced by InitOutput().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html new file mode 100644 index 000000000..427a32677 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html @@ -0,0 +1,76 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html index a0f20c462..5394adea1 100644 --- a/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html @@ -6,137 +6,132 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxvisual.c File Reference

#include "dmx.h"
-#include "dmxvisual.h"
-#include "scrnintstr.h"
- - - - - - - - - + + +
+

dmxvisual.c File Reference

#include "dmx.h"
+#include "dmxvisual.h"
+#include "scrnintstr.h"
+

Functions

Visual * dmxLookupVisual (ScreenPtr pScreen, VisualPtr pVisual)
Visual * dmxLookupVisualFromID (ScreenPtr pScreen, VisualID vid)
Colormap dmxColormapFromDefaultVisual (ScreenPtr pScreen, Visual *visual)
+ + + +

Functions

Visual * dmxLookupVisual (ScreenPtr pScreen, VisualPtr pVisual)
Visual * dmxLookupVisualFromID (ScreenPtr pScreen, VisualID vid)
Colormap dmxColormapFromDefaultVisual (ScreenPtr pScreen, Visual *visual)
-

Detailed Description

-This file provides support for visuals.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file provides support for visuals.

+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
Colormap dmxColormapFromDefaultVisual ( ScreenPtr  pScreen, Colormap dmxColormapFromDefaultVisual (ScreenPtr  pScreen,
Visual *  visualVisual *  visual 
) )
-
- - - - - -
-   - + +
+

Return the colormap for the visual.

-

-Return the colormap for the visual.

-

- - - - -
- +

References _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beVisuals, and dmxScreens.

+ +

Referenced by dmxGetDefaultWindowAttributes().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Visual* dmxLookupVisual ( ScreenPtr  pScreen, Visual* dmxLookupVisual (ScreenPtr  pScreen,
VisualPtr  pVisualVisualPtr  pVisual 
) )
-
- - - - - -
-   - + +
+

Return the visual that matched pVisual.

-

-Return the visual that matched pVisual.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, and dmxScreens.

+ +

Referenced by dmxBECreateColormap(), and dmxLookupVisualFromID().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Visual* dmxLookupVisualFromID ( ScreenPtr  pScreen, Visual* dmxLookupVisualFromID (ScreenPtr  pScreen,
VisualID  vidVisualID  vid 
) )
-
- - - - - -
-   - + +
+

Return the visual that matched the vid.

-

-Return the visual that matched the vid.

+

References _DMXScreenInfo::beDisplay, dmxLookupVisual(), and dmxScreens.

+ +

Referenced by dmxCreateWindow(), and dmxGetDefaultWindowAttributes().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html deleted file mode 100644 index cda02947e..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxvisual.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXVISUAL_H
-00039 #define DMXVISUAL_H
-00040 
-00041 #include "scrnintstr.h"
-00042 
-00043 extern Visual   *dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual);
-00044 extern Visual   *dmxLookupVisualFromID(ScreenPtr pScreen, VisualID vid);
-00045 extern Colormap  dmxColormapFromDefaultVisual(ScreenPtr pScreen,
-00046                                               Visual *visual);
-00047 
-00048 #endif /* DMXVISUAL_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html index d56bb1c9a..6300da7e7 100644 --- a/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html @@ -6,138 +6,133 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxvisual.h File Reference

#include "scrnintstr.h"
- -

-Go to the source code of this file. - - - - - - - + + +
+

dmxvisual.h File Reference

#include "scrnintstr.h"
+

Go to the source code of this file.

+

Functions

Visual * dmxLookupVisual (ScreenPtr pScreen, VisualPtr pVisual)
Visual * dmxLookupVisualFromID (ScreenPtr pScreen, VisualID vid)
Colormap dmxColormapFromDefaultVisual (ScreenPtr pScreen, Visual *visual)
+ + + +

Functions

Visual * dmxLookupVisual (ScreenPtr pScreen, VisualPtr pVisual)
Visual * dmxLookupVisualFromID (ScreenPtr pScreen, VisualID vid)
Colormap dmxColormapFromDefaultVisual (ScreenPtr pScreen, Visual *visual)
-

Detailed Description

-Interface for visual support.
See also:
dmxvisual.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface for visual support.

+
See also:
dmxvisual.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
Colormap dmxColormapFromDefaultVisual ( ScreenPtr  pScreen, Colormap dmxColormapFromDefaultVisual (ScreenPtr  pScreen,
Visual *  visualVisual *  visual 
) )
-
- - - - - -
-   - + +
+

Return the colormap for the visual.

-

-Return the colormap for the visual.

-

- - - - -
- +

References _DMXScreenInfo::beDefColormaps, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumDefColormaps, _DMXScreenInfo::beVisuals, and dmxScreens.

+ +

Referenced by dmxGetDefaultWindowAttributes().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Visual* dmxLookupVisual ( ScreenPtr  pScreen, Visual* dmxLookupVisual (ScreenPtr  pScreen,
VisualPtr  pVisualVisualPtr  pVisual 
) )
-
- - - - - -
-   - + +
+

Return the visual that matched pVisual.

-

-Return the visual that matched pVisual.

-

- - - - -
- +

References _DMXScreenInfo::beDisplay, _DMXScreenInfo::beNumVisuals, _DMXScreenInfo::beVisuals, and dmxScreens.

+ +

Referenced by dmxBECreateColormap(), and dmxLookupVisualFromID().

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
Visual* dmxLookupVisualFromID ( ScreenPtr  pScreen, Visual* dmxLookupVisualFromID (ScreenPtr  pScreen,
VisualID  vidVisualID  vid 
) )
-
- - - - - -
-   - + +
+

Return the visual that matched the vid.

-

-Return the visual that matched the vid.

+

References _DMXScreenInfo::beDisplay, dmxLookupVisual(), and dmxScreens.

+ +

Referenced by dmxCreateWindow(), and dmxGetDefaultWindowAttributes().

+ + + +
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html new file mode 100644 index 000000000..a9801de68 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html @@ -0,0 +1,80 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html index ef3509d3c..968515b1e 100644 --- a/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html @@ -6,851 +6,851 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxwindow.c File Reference

#include "dmx.h"
-#include "dmxsync.h"
-#include "dmxwindow.h"
-#include "dmxpixmap.h"
-#include "dmxcmap.h"
-#include "dmxvisual.h"
-#include "dmxinput.h"
-#include "dmxextension.h"
-#include "dmxpict.h"
-#include "windowstr.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxwindow.c File Reference

#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+#include "dmxcmap.h"
+#include "dmxvisual.h"
+#include "dmxinput.h"
+#include "dmxextension.h"
+#include "dmxpict.h"
+#include "windowstr.h"
+

Functions

Bool dmxInitWindow (ScreenPtr pScreen)
void dmxResizeScreenWindow (ScreenPtr pScreen, int x, int y, int w, int h)
void dmxResizeRootWindow (WindowPtr pRoot, int x, int y, int w, int h)
void dmxCreateAndRealizeWindow (WindowPtr pWindow, Bool doSync)
Bool dmxCreateWindow (WindowPtr pWindow)
Bool dmxBEDestroyWindow (WindowPtr pWindow)
Bool dmxDestroyWindow (WindowPtr pWindow)
Bool dmxPositionWindow (WindowPtr pWindow, int x, int y)
Bool dmxChangeWindowAttributes (WindowPtr pWindow, unsigned long mask)
Bool dmxRealizeWindow (WindowPtr pWindow)
Bool dmxUnrealizeWindow (WindowPtr pWindow)
void dmxRestackWindow (WindowPtr pWindow, WindowPtr pOldNextSib)
void dmxWindowExposures (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
void dmxPaintWindowBackground (WindowPtr pWindow, RegionPtr pRegion, int what)
void dmxPaintWindowBorder (WindowPtr pWindow, RegionPtr pRegion, int what)
void dmxCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
void dmxResizeWindow (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)
void dmxReparentWindow (WindowPtr pWindow, WindowPtr pPriorParent)
void dmxChangeBorderWidth (WindowPtr pWindow, unsigned int width)
+ + + + + + + + + + + + + + + + + + + + + + + + + + +

Functions

static void dmxDoRestackWindow (WindowPtr pWindow)
static void dmxDoChangeWindowAttributes (WindowPtr pWindow, unsigned long *mask, XSetWindowAttributes *attribs)
static void dmxDoSetShape (WindowPtr pWindow)
Bool dmxInitWindow (ScreenPtr pScreen)
Window dmxCreateRootWindow (WindowPtr pWindow)
void dmxResizeScreenWindow (ScreenPtr pScreen, int x, int y, int w, int h)
void dmxResizeRootWindow (WindowPtr pRoot, int x, int y, int w, int h)
void dmxGetDefaultWindowAttributes (WindowPtr pWindow, Colormap *cmap, Visual **visual)
static Window dmxCreateNonRootWindow (WindowPtr pWindow)
void dmxCreateAndRealizeWindow (WindowPtr pWindow, Bool doSync)
Bool dmxCreateWindow (WindowPtr pWindow)
Bool dmxBEDestroyWindow (WindowPtr pWindow)
Bool dmxDestroyWindow (WindowPtr pWindow)
Bool dmxPositionWindow (WindowPtr pWindow, int x, int y)
Bool dmxChangeWindowAttributes (WindowPtr pWindow, unsigned long mask)
Bool dmxRealizeWindow (WindowPtr pWindow)
Bool dmxUnrealizeWindow (WindowPtr pWindow)
void dmxRestackWindow (WindowPtr pWindow, WindowPtr pOldNextSib)
static Bool dmxWindowExposurePredicate (Display *dpy, XEvent *ev, XPointer ptr)
void dmxWindowExposures (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
void dmxCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
void dmxResizeWindow (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)
void dmxReparentWindow (WindowPtr pWindow, WindowPtr pPriorParent)
void dmxChangeBorderWidth (WindowPtr pWindow, unsigned int width)
void dmxSetShape (WindowPtr pWindow)
+

Detailed Description

+

This file provides support for window-related functions.

+

Function Documentation

+ +
+
+ + + + + + + + + +
Bool dmxBEDestroyWindow (WindowPtr  pWindow ) 
+
+
+

Destroy pWindow on the back-end server.

-void dmxSetShape (WindowPtr pWindow) +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, and _dmxWinPriv::window.

- -

Detailed Description

-This file provides support for window-related functions.

Function Documentation

-

- - - - -
- - - - - - - - - +

Referenced by dmxBEDestroyWindowTree(), and dmxDestroyWindow().

-
Bool dmxBEDestroyWindow ( WindowPtr  pWindow  ) 
-
- - - - - -
-   - - -

-Destroy pWindow on the back-end server.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangeBorderWidth ( WindowPtr  pWindow, void dmxChangeBorderWidth (WindowPtr  pWindow,
unsigned int  widthunsigned int  width 
) )
-
- - - - - -
-   - - -

-Change border width for pWindow to width pixels.

-

- - - - -
- + +
+

Change border width for pWindow to width pixels.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangeBorderWidth(), dmxScreens, dmxSync(), and _dmxWinPriv::window.

+ +

Referenced by dmxChangeBorderWidth(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxChangeWindowAttributes ( WindowPtr  pWindow, Bool dmxChangeWindowAttributes (WindowPtr  pWindow,
unsigned long  maskunsigned long  mask 
) )
-
- - - - - -
-   - - -

-Change the window attributes of pWindow.

-

- - - - -
- + +
+

Change the window attributes of pWindow.

+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangeWindowAttributes(), dmxDoChangeWindowAttributes(), dmxScreens, dmxSync(), and _dmxWinPriv::window.

+ +

Referenced by dmxChangeWindowAttributes(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCopyWindow ( WindowPtr  pWindow, void dmxCopyWindow (WindowPtr  pWindow,
DDXPointRec  ptOldOrg, DDXPointRec  ptOldOrg,
RegionPtr  prgnSrcRegionPtr  prgnSrc 
) )
-
- - - - - -
-   - - -

-Move pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

-

- - - - -
- + +
+

Move pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_COPY, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxCopyWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCreateAndRealizeWindow ( WindowPtr  pWindow, void dmxCreateAndRealizeWindow (WindowPtr  pWindow,
Bool  doSyncBool  doSync 
) )
-
- - - - - -
-   - - -

-This function handles lazy window creation and realization. Window creation is handled by dmxCreateNonRootWindow(). It also handles any stacking changes that have occured since the window was originally created by calling dmxDoRestackWindow(). If the window is shaped, the shape is set on the back-end server by calling dmxDoSetShape(), and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling dmxCreatePictureList(). If doSync is TRUE, then dmxSync() is called.

-

- - - - -
- + +
+

This function handles lazy window creation and realization. Window creation is handled by dmxCreateNonRootWindow(). It also handles any stacking changes that have occured since the window was originally created by calling dmxDoRestackWindow(). If the window is shaped, the shape is set on the back-end server by calling dmxDoSetShape(), and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling dmxCreatePictureList(). If doSync is TRUE, then dmxSync() is called.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxCreateNonRootWindow(), dmxCreatePictureList(), dmxDoRestackWindow(), dmxDoSetShape(), dmxScreens, dmxSync(), _dmxWinPriv::hasPict, _dmxWinPriv::isShaped, _dmxWinPriv::mapped, _dmxWinPriv::restacked, and _dmxWinPriv::window.

+ +

Referenced by dmxBECreateWindowTree(), dmxCopyWindow(), dmxCreateNonRootWindow(), dmxForceWindowCreation(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), and dmxResizeWindow().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxCreateWindow ( WindowPtr  pWindow  ) static Window dmxCreateNonRootWindow (WindowPtr  pWindow )  [static]
-
- - - - - -
-   - - -

-Create pWindow on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by dmxCreateAndRealizeWindow().

-

- - - - -
- + +
+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDisplay, _dmxWinPriv::cmap, DMX_GET_WINDOW_PRIV, dmxCreateAndRealizeWindow(), dmxDoChangeWindowAttributes(), dmxScreens, _dmxWinPriv::restacked, _dmxWinPriv::visual, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateAndRealizeWindow(), and dmxCreateWindow().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxDestroyWindow ( WindowPtr  pWindow  ) Window dmxCreateRootWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Destroy pWindow on the back-end server. If any RENDER pictures were created, destroy them as well.

-

- - - - -
- + +
+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_GET_WINDOW_PRIV, dmxDoChangeWindowAttributes(), dmxScreens, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBECreateWindowTree(), and dmxCreateWindow().

+ +
+ + +
+
+
- - - - - - + + + + + + +
Bool dmxInitWindow ( ScreenPtr  pScreen  ) Bool dmxCreateWindow (WindowPtr  pWindow ) 
+ +
+

Create pWindow on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by dmxCreateAndRealizeWindow().

+

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDisplay, _dmxWinPriv::cmap, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCreateNonRootWindow(), dmxCreateRootWindow(), dmxCreateWindow(), dmxGetDefaultWindowAttributes(), dmxLazyWindowCreation, dmxLookupVisualFromID(), dmxResizeRootWindow(), dmxScreens, dmxSync(), dmxUpdateScreenResources(), _dmxWinPriv::hasPict, _DMXScreenInfo::index, _dmxWinPriv::isShaped, _dmxWinPriv::mapped, _dmxWinPriv::offscreen, _dmxWinPriv::restacked, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootWin, _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _dmxWinPriv::visual, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateWindow(), and dmxScreenInit().

+ +
+ + +
+
+ + + + + + + + +
Bool dmxDestroyWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Initialize the private area for the window functions.

-

- - - - -
- + +
+

Destroy pWindow on the back-end server. If any RENDER pictures were created, destroy them as well.

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEDestroyWindow(), dmxDestroyPictureList(), dmxDestroyWindow(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + +
void dmxPaintWindowBackground ( WindowPtr  pWindow, static void dmxDoChangeWindowAttributes (WindowPtr  pWindow,
RegionPtr  pRegion, unsigned long *  mask,
int  whatXSetWindowAttributes *  attribs 
) ) [static]
+ +
+

References _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_GET_PIXMAP_PRIV, and _dmxPixPriv::pixmap.

+ +

Referenced by dmxChangeWindowAttributes(), dmxCreateNonRootWindow(), and dmxCreateRootWindow().

+ +
+ + +
+
+ + + + + + + + +
static void dmxDoRestackWindow (WindowPtr  pWindow )  [static]
-
- - - - - -
-   - - -

-Paint background of pWindow in pRegion.

-

- - - - -
- + +
+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateAndRealizeWindow(), and dmxRestackWindow().

+ +
+ + +
+
+
+ + + + + + + + +
static void dmxDoSetShape (WindowPtr  pWindow )  [static]
+ +
+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateAndRealizeWindow(), and dmxSetShape().

+ +
+ + +
+
+ - - - - + + + + + - - - + + + - - - + + - - + + +
void dmxPaintWindowBorder ( WindowPtr  pWindow, void dmxGetDefaultWindowAttributes (WindowPtr  pWindow,
RegionPtr  pRegion, Colormap *  cmap,
int  whatVisual **  visual 
) )
+
+
+

References _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, dmxColormapFromDefaultVisual(), and dmxLookupVisualFromID().

+ +

Referenced by dmxBECreateWindowTree(), and dmxCreateWindow().

+ +
+
+ +
+
+ + + + + + + + +
Bool dmxInitWindow (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Paint window border for pWindow in pRegion.

-

- - - - -
- + +
+

Initialize the private area for the window functions.

+ +

References dmxWinPrivateKey.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
Bool dmxPositionWindow ( WindowPtr  pWindow, Bool dmxPositionWindow (WindowPtr  pWindow,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - - -

-Change the position of pWindow to be x, y.

-

- - - - -
- + +
+

Change the position of pWindow to be x, y.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxPositionWindow(), dmxScreens, dmxSync(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxPositionWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxRealizeWindow ( WindowPtr  pWindow  ) Bool dmxRealizeWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Realize pWindow on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.

-

- - - - -
- + +
+

Realize pWindow on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_REALIZE, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxRealizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxRealizeWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxReparentWindow ( WindowPtr  pWindow, void dmxReparentWindow (WindowPtr  pWindow,
WindowPtr  pPriorParentWindowPtr  pPriorParent 
) )
-
- - - - - -
-   - - -

-Reparent pWindow on the back-end server.

-

- - - - -
- + +
+

Reparent pWindow on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_REPARENT, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxReparentWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), and _dmxWinPriv::window.

+ +

Referenced by dmxReparentWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeRootWindow ( WindowPtr  pRoot, void dmxResizeRootWindow (WindowPtr  pRoot,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  hint  h 
) )
-
- - - - - -
-   - - -

-Change the location and size of the "root" window. Called from #dmxReconfigureRootWindow().

-

- - - - -
- + +
+

Change the location and size of the "root" window. Called from dmxConfigureRootWindow.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, dmxSync(), _dmxWinPriv::mapped, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateWindow().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeScreenWindow ( ScreenPtr  pScreen, void dmxResizeScreenWindow (ScreenPtr  pScreen,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  hint  h 
) )
-
- - - - - -
-   - - -

-Change the location and size of the "screen" window. Called from #dmxReconfigureScreenWindow().

-

- - - - -
- + +
+

Change the location and size of the "screen" window. Called from dmxConfigureScreenWindow().

+ +

References _DMXScreenInfo::beDisplay, dmxScreens, dmxSync(), and _DMXScreenInfo::scrnWin.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeWindow ( WindowPtr  pWindow, void dmxResizeWindow (WindowPtr  pWindow,
int  x, int  x,
int  y, int  y,
unsigned int  w, unsigned int  w,
unsigned int  h, unsigned int  h,
WindowPtr  pSibWindowPtr  pSib 
) )
-
- - - - - -
-   - - -

-Resize pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

-

- - - - -
- + +
+

Resize pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_RESIZE, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxResizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxResizeWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxRestackWindow ( WindowPtr  pWindow, void dmxRestackWindow (WindowPtr  pWindow,
WindowPtr  pOldNextSibWindowPtr  pOldNextSib 
) )
-
- - - - - -
-   - - -

-Handle window restacking. The actual restacking occurs in dmxDoRestackWindow().

-

- - - - -
- + +
+

Handle window restacking. The actual restacking occurs in dmxDoRestackWindow().

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_RESTACK, DMX_WRAP, dmxDoRestackWindow(), dmxRestackWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::restacked, and _dmxWinPriv::window.

+ +

Referenced by dmxRestackWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSetShape ( WindowPtr  pWindow  ) void dmxSetShape (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Set shape of pWindow on the back-end server.

-

- - - - -
- + +
+

Set shape of pWindow on the back-end server.

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxDoSetShape(), dmxScreens, dmxSetShape(), dmxSync(), _dmxWinPriv::isShaped, and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxSetShape().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxUnrealizeWindow ( WindowPtr  pWindow  ) Bool dmxUnrealizeWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Unrealize pWindow on the back-end server.

-

- - - - -
- + +
+

Unrealize pWindow on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_UNREALIZE, DMX_WRAP, dmxScreens, dmxSync(), dmxUnrealizeWindow(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxUnrealizeWindow().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + + + +
void dmxWindowExposures ( WindowPtr  pWindow, static Bool dmxWindowExposurePredicate (Display *  dpy,
XEvent *  ev,
RegionPtr  prgn, XPointer  ptr 
) [static]
+ +
+ +

Referenced by dmxWindowExposures().

+ +
+ + +
+
+ + + + + + + + + - - + + + - - + + + + + + + -
void dmxWindowExposures (WindowPtr  pWindow,
RegionPtr  other_exposedRegionPtr  prgn,
) RegionPtr  other_exposed 
)
-
- - - - - -
-   - - -

-Handle exposures on pWindow. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.

+

+
+

Handle exposures on pWindow. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxSync(), dmxWindowExposurePredicate(), dmxWindowExposures(), and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxWindowExposures().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html deleted file mode 100644 index a1bbda691..000000000 --- a/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxwindow.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Kevin E. Martin <kem@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef DMXWINDOW_H
-00039 #define DMXWINDOW_H
-00040 
-00041 #include "windowstr.h"
-00042 
-00044 typedef struct _dmxWinPriv {
-00045     Window         window;
-00046     Bool           offscreen;
-00047     Bool           mapped;
-00048     Bool           restacked;
-00049     unsigned long  attribMask;
-00050     Colormap       cmap;
-00051     Visual        *visual;
-00052 #ifdef SHAPE
-00053     Bool           isShaped;
-00054 #endif
-00055 #ifdef RENDER
-00056     Bool           hasPict;
-00057 #endif
-00058 #ifdef GLXEXT
-00059     void          *swapGroup;
-00060     int            barrier;
-00061     void         (*windowDestroyed)(WindowPtr);
-00062     void         (*windowUnmapped)(WindowPtr);
-00063 #endif
-00064 } dmxWinPrivRec, *dmxWinPrivPtr;
-00065 
-00066 
-00067 extern Bool dmxInitWindow(ScreenPtr pScreen);
-00068 
-00069 extern Window dmxCreateRootWindow(WindowPtr pWindow);
-00070 
-00071 extern void dmxGetDefaultWindowAttributes(WindowPtr pWindow,
-00072                                           Colormap *cmap,
-00073                                           Visual **visual);
-00074 extern void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync);
-00075 
-00076 extern Bool dmxCreateWindow(WindowPtr pWindow);
-00077 extern Bool dmxDestroyWindow(WindowPtr pWindow);
-00078 extern Bool dmxPositionWindow(WindowPtr pWindow, int x, int y);
-00079 extern Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask);
-00080 extern Bool dmxRealizeWindow(WindowPtr pWindow);
-00081 extern Bool dmxUnrealizeWindow(WindowPtr pWindow);
-00082 extern void dmxRestackWindow(WindowPtr pWindow, WindowPtr pOldNextSib);
-00083 extern void dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn,
-00084                                RegionPtr other_exposed);
-00085 extern void dmxPaintWindowBackground(WindowPtr pWindow, RegionPtr pRegion,
-00086                                      int what);
-00087 extern void dmxPaintWindowBorder(WindowPtr pWindow, RegionPtr pRegion,
-00088                                  int what);
-00089 extern void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
-00090                           RegionPtr prgnSrc);
-00091 
-00092 extern void dmxResizeWindow(WindowPtr pWindow, int x, int y,
-00093                             unsigned int w, unsigned int h, WindowPtr pSib);
-00094 extern void dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent);
-00095 
-00096 extern void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width);
-00097 
-00098 extern void dmxResizeScreenWindow(ScreenPtr pScreen,
-00099                                   int x, int y, int w, int h);
-00100 extern void dmxResizeRootWindow(WindowPtr pRoot,
-00101                                 int x, int y, int w, int h);
-00102 
-00103 extern Bool dmxBEDestroyWindow(WindowPtr pWindow);
-00104 
-00105 #ifdef SHAPE
-00106 /* Support for shape extension */
-00107 extern void dmxSetShape(WindowPtr pWindow);
-00108 #endif
-00109 
-00111 extern int dmxWinPrivateIndex;
-00112 
-00114 #define DMX_GET_WINDOW_PRIV(_pWin)                                      \
-00115     ((dmxWinPrivPtr)(_pWin)->devPrivates[dmxWinPrivateIndex].ptr)
-00116 
-00117 /* All of these macros are only used in dmxwindow.c */
-00118 #define DMX_WINDOW_FUNC_PROLOGUE(_pGC)                                  \
-00119 do {                                                                    \
-00120     dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \
-00121     DMX_UNWRAP(funcs, pGCPriv, (_pGC));                                 \
-00122     if (pGCPriv->ops)                                                   \
-00123         DMX_UNWRAP(ops, pGCPriv, (_pGC));                               \
-00124 } while (0)
-00125 
-00126 #define DMX_WINDOW_FUNC_EPILOGUE(_pGC)                                  \
-00127 do {                                                                    \
-00128     dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \
-00129     DMX_WRAP(funcs, &dmxGCFuncs, pGCPriv, (_pGC));                      \
-00130     if (pGCPriv->ops)                                                   \
-00131         DMX_WRAP(ops, &dmxGCOps, pGCPriv, (_pGC));                      \
-00132 } while (0)
-00133 
-00134 #define DMX_WINDOW_X1(_pWin)                                            \
-00135     ((_pWin)->drawable.x - wBorderWidth(_pWin))
-00136 #define DMX_WINDOW_Y1(_pWin)                                            \
-00137     ((_pWin)->drawable.y - wBorderWidth(_pWin))
-00138 #define DMX_WINDOW_X2(_pWin)                                            \
-00139     ((_pWin)->drawable.x + wBorderWidth(_pWin) + (_pWin)->drawable.width) 
-00140 #define DMX_WINDOW_Y2(_pWin)                                            \
-00141     ((_pWin)->drawable.y + wBorderWidth(_pWin) + (_pWin)->drawable.height) 
-00142 
-00143 #define DMX_WINDOW_OFFSCREEN(_pWin)                                     \
-00144     (DMX_WINDOW_X1(_pWin) >= (_pWin)->drawable.pScreen->width  ||       \
-00145      DMX_WINDOW_Y1(_pWin) >= (_pWin)->drawable.pScreen->height ||       \
-00146      DMX_WINDOW_X2(_pWin) <= 0                                 ||       \
-00147      DMX_WINDOW_Y2(_pWin) <= 0)
-00148 
-00149 #endif /* DMXWINDOW_H */
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html index f80aae3c3..e1d7e2683 100644 --- a/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html +++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html @@ -6,955 +6,935 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxwindow.h File Reference

#include "windowstr.h"
- -

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

dmxwindow.h File Reference

#include "windowstr.h"
+ +

Go to the source code of this file.

+

Data Structures

struct  _dmxWinPriv

Defines

#define DMX_GET_WINDOW_PRIV(_pWin)   ((dmxWinPrivPtr)(_pWin)->devPrivates[dmxWinPrivateIndex].ptr)

Typedefs

typedef _dmxWinPriv dmxWinPrivRec
typedef _dmxWinPriv * dmxWinPrivPtr

Functions

Bool dmxInitWindow (ScreenPtr pScreen)
void dmxCreateAndRealizeWindow (WindowPtr pWindow, Bool doSync)
Bool dmxCreateWindow (WindowPtr pWindow)
Bool dmxDestroyWindow (WindowPtr pWindow)
Bool dmxPositionWindow (WindowPtr pWindow, int x, int y)
Bool dmxChangeWindowAttributes (WindowPtr pWindow, unsigned long mask)
Bool dmxRealizeWindow (WindowPtr pWindow)
Bool dmxUnrealizeWindow (WindowPtr pWindow)
void dmxRestackWindow (WindowPtr pWindow, WindowPtr pOldNextSib)
void dmxWindowExposures (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
void dmxPaintWindowBackground (WindowPtr pWindow, RegionPtr pRegion, int what)
void dmxPaintWindowBorder (WindowPtr pWindow, RegionPtr pRegion, int what)
void dmxCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
void dmxResizeWindow (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)
void dmxReparentWindow (WindowPtr pWindow, WindowPtr pPriorParent)
void dmxChangeBorderWidth (WindowPtr pWindow, unsigned int width)
void dmxResizeScreenWindow (ScreenPtr pScreen, int x, int y, int w, int h)
void dmxResizeRootWindow (WindowPtr pRoot, int x, int y, int w, int h)
Bool dmxBEDestroyWindow (WindowPtr pWindow)
void dmxSetShape (WindowPtr pWindow)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _dmxWinPriv

Defines

#define DMX_GET_WINDOW_PRIV(_pWin)
#define DMX_WINDOW_FUNC_PROLOGUE(_pGC)
#define DMX_WINDOW_FUNC_EPILOGUE(_pGC)
#define DMX_WINDOW_X1(_pWin)   ((_pWin)->drawable.x - wBorderWidth(_pWin))
#define DMX_WINDOW_Y1(_pWin)   ((_pWin)->drawable.y - wBorderWidth(_pWin))
#define DMX_WINDOW_X2(_pWin)   ((_pWin)->drawable.x + wBorderWidth(_pWin) + (_pWin)->drawable.width)
#define DMX_WINDOW_Y2(_pWin)   ((_pWin)->drawable.y + wBorderWidth(_pWin) + (_pWin)->drawable.height)
#define DMX_WINDOW_OFFSCREEN(_pWin)

Typedefs

typedef struct _dmxWinPriv dmxWinPrivRec
typedef struct _dmxWinPriv * dmxWinPrivPtr

Functions

Bool dmxInitWindow (ScreenPtr pScreen)
Window dmxCreateRootWindow (WindowPtr pWindow)
void dmxGetDefaultWindowAttributes (WindowPtr pWindow, Colormap *cmap, Visual **visual)
void dmxCreateAndRealizeWindow (WindowPtr pWindow, Bool doSync)
Bool dmxCreateWindow (WindowPtr pWindow)
Bool dmxDestroyWindow (WindowPtr pWindow)
Bool dmxPositionWindow (WindowPtr pWindow, int x, int y)
Bool dmxChangeWindowAttributes (WindowPtr pWindow, unsigned long mask)
Bool dmxRealizeWindow (WindowPtr pWindow)
Bool dmxUnrealizeWindow (WindowPtr pWindow)
void dmxRestackWindow (WindowPtr pWindow, WindowPtr pOldNextSib)
void dmxWindowExposures (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
void dmxCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
void dmxResizeWindow (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)
void dmxReparentWindow (WindowPtr pWindow, WindowPtr pPriorParent)
void dmxChangeBorderWidth (WindowPtr pWindow, unsigned int width)
void dmxResizeScreenWindow (ScreenPtr pScreen, int x, int y, int w, int h)
void dmxResizeRootWindow (WindowPtr pRoot, int x, int y, int w, int h)
Bool dmxBEDestroyWindow (WindowPtr pWindow)
void dmxSetShape (WindowPtr pWindow)

Variables

DevPrivateKey dmxWinPrivateKey
+

Detailed Description

+

Interface for window support.

+
See also:
dmxwindow.c
+

Define Documentation

+ +
+
+ + + + + + + + + +
#define DMX_GET_WINDOW_PRIV(_pWin  ) 
+
+
+Value:
((dmxWinPrivPtr) \
+    dixLookupPrivate(&(_pWin)->devPrivates, dmxWinPrivateKey))
+

Get window private pointer.

-

Variables

-int dmxWinPrivateIndex +

Referenced by dmxBECreateWindowTree(), dmxBEDestroyWindow(), dmxChangeBorderWidth(), dmxChangeWindowAttributes(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateNonRootWindow(), dmxCreateRootWindow(), dmxCreateWindow(), dmxDestroyWindow(), dmxDoCreatePicture(), dmxDoRestackWindow(), dmxDoSetShape(), dmxForceWindowCreation(), dmxGetWindowAttributes(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSetShape(), dmxUnrealizeWindow(), and dmxWindowExposures().

- -

Detailed Description

-Interface for window support.
See also:
dmxwindow.c
-

Define Documentation

-

- - - + + + +
+
+
- - - - - - - - - -
#define DMX_GET_WINDOW_PRIV( _pWin   )    ((dmxWinPrivPtr)(_pWin)->devPrivates[dmxWinPrivateIndex].ptr) + + + +
+
+ + + + + + + + +
#define DMX_WINDOW_FUNC_EPILOGUE(_pGC  ) 
-
- - - - - -
-   - - -

-Get window private pointer.

-

Typedef Documentation

-

- - - + + + +
+
+
- - - - -
typedef struct _dmxWinPriv * dmxWinPrivPtr + +
+Value:
do {                                                                    \
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \
+    DMX_WRAP(funcs, &dmxGCFuncs, pGCPriv, (_pGC));                      \
+    if (pGCPriv->ops)                                                   \
+        DMX_WRAP(ops, &dmxGCOps, pGCPriv, (_pGC));                      \
+} while (0)
+
+
+ + +
+
+ + + + + + + + +
#define DMX_WINDOW_FUNC_PROLOGUE(_pGC  ) 
-
- - - - - -
-   - - -

-Window private area.

-

- - - - -
- + +
+Value:
do {                                                                    \
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \
+    DMX_UNWRAP(funcs, pGCPriv, (_pGC));                                 \
+    if (pGCPriv->ops)                                                   \
+        DMX_UNWRAP(ops, pGCPriv, (_pGC));                               \
+} while (0)
+
+
+ + +
+
+
+ + + + + + + + +
#define DMX_WINDOW_OFFSCREEN(_pWin  ) 
+ +
+Value:
(DMX_WINDOW_X1(_pWin) >= (_pWin)->drawable.pScreen->width  ||   \
+     DMX_WINDOW_Y1(_pWin) >= (_pWin)->drawable.pScreen->height ||       \
+     DMX_WINDOW_X2(_pWin) <= 0                                 ||       \
+     DMX_WINDOW_Y2(_pWin) <= 0)
+
+

Referenced by dmxCopyWindow(), dmxPositionWindow(), dmxRealizeWindow(), and dmxResizeWindow().

+ +
+ + +
+
+ + + + + + + + + +
#define DMX_WINDOW_X1(_pWin  )    ((_pWin)->drawable.x - wBorderWidth(_pWin))
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define DMX_WINDOW_X2(_pWin  )    ((_pWin)->drawable.x + wBorderWidth(_pWin) + (_pWin)->drawable.width)
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define DMX_WINDOW_Y1(_pWin  )    ((_pWin)->drawable.y - wBorderWidth(_pWin))
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define DMX_WINDOW_Y2(_pWin  )    ((_pWin)->drawable.y + wBorderWidth(_pWin) + (_pWin)->drawable.height)
+
+
+ +
+
+

Typedef Documentation

+ +
+
+ - +
typedef struct _dmxWinPriv dmxWinPrivRec + typedef struct _dmxWinPriv * dmxWinPrivPtr
-
- - - - - -
-   - - -

-Window private area.

-

Function Documentation

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - - - + +
Bool dmxBEDestroyWindow ( WindowPtr  pWindow  ) typedef struct _dmxWinPriv dmxWinPrivRec
+ +
+

Window private area.

+
+ +

Function Documentation

+ +
+
+ + + + + + + + +
Bool dmxBEDestroyWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Destroy pWindow on the back-end server.

-

- - - - -
- + +
+

Destroy pWindow on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, and _dmxWinPriv::window.

+ +

Referenced by dmxBEDestroyWindowTree(), and dmxDestroyWindow().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxChangeBorderWidth ( WindowPtr  pWindow, void dmxChangeBorderWidth (WindowPtr  pWindow,
unsigned int  widthunsigned int  width 
) )
-
- - - - - -
-   - - -

-Change border width for pWindow to width pixels.

-

- - - - -
- + +
+

Change border width for pWindow to width pixels.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangeBorderWidth(), dmxScreens, dmxSync(), and _dmxWinPriv::window.

+ +

Referenced by dmxChangeBorderWidth(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
Bool dmxChangeWindowAttributes ( WindowPtr  pWindow, Bool dmxChangeWindowAttributes (WindowPtr  pWindow,
unsigned long  maskunsigned long  mask 
) )
-
- - - - - -
-   - - -

-Change the window attributes of pWindow.

-

- - - - -
- + +
+

Change the window attributes of pWindow.

+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxChangeWindowAttributes(), dmxDoChangeWindowAttributes(), dmxScreens, dmxSync(), and _dmxWinPriv::window.

+ +

Referenced by dmxChangeWindowAttributes(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxCopyWindow ( WindowPtr  pWindow, void dmxCopyWindow (WindowPtr  pWindow,
DDXPointRec  ptOldOrg, DDXPointRec  ptOldOrg,
RegionPtr  prgnSrcRegionPtr  prgnSrc 
) )
-
- - - - - -
-   - - -

-Move pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

-

- - - - -
- + +
+

Move pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_COPY, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxCopyWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxCreateAndRealizeWindow ( WindowPtr  pWindow, void dmxCreateAndRealizeWindow (WindowPtr  pWindow,
Bool  doSyncBool  doSync 
) )
-
- - - - - -
-   - - -

-This function handles lazy window creation and realization. Window creation is handled by dmxCreateNonRootWindow(). It also handles any stacking changes that have occured since the window was originally created by calling dmxDoRestackWindow(). If the window is shaped, the shape is set on the back-end server by calling dmxDoSetShape(), and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling dmxCreatePictureList(). If doSync is TRUE, then dmxSync() is called.

-

- - - - -
- - - - - - - - - + +
+

This function handles lazy window creation and realization. Window creation is handled by dmxCreateNonRootWindow(). It also handles any stacking changes that have occured since the window was originally created by calling dmxDoRestackWindow(). If the window is shaped, the shape is set on the back-end server by calling dmxDoSetShape(), and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling dmxCreatePictureList(). If doSync is TRUE, then dmxSync() is called.

-
Bool dmxCreateWindow ( WindowPtr  pWindow  ) 
-
- - - - - -
-   - - -

-Create pWindow on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by dmxCreateAndRealizeWindow().

-

- - - - -
- - - - - - - - - +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxCreateNonRootWindow(), dmxCreatePictureList(), dmxDoRestackWindow(), dmxDoSetShape(), dmxScreens, dmxSync(), _dmxWinPriv::hasPict, _dmxWinPriv::isShaped, _dmxWinPriv::mapped, _dmxWinPriv::restacked, and _dmxWinPriv::window.

-
Bool dmxDestroyWindow ( WindowPtr  pWindow  ) 
-
- - - - - -
-   - - -

-Destroy pWindow on the back-end server. If any RENDER pictures were created, destroy them as well.

-

- - - - -
- - - - - - - - - +

Referenced by dmxBECreateWindowTree(), dmxCopyWindow(), dmxCreateNonRootWindow(), dmxForceWindowCreation(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), and dmxResizeWindow().

-
Bool dmxInitWindow ( ScreenPtr  pScreen  ) 
-
- - - - - -
-   - - -

-Initialize the private area for the window functions.

-

- - - - -
- + + + +
+
+
- - - - - - - + + + + + - - +
void dmxPaintWindowBackground ( WindowPtr  pWindow,
Window dmxCreateRootWindow (WindowPtr  pWindow )  RegionPtr  pRegion,
+ +
+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDefVisualIndex, _DMXScreenInfo::beDisplay, _DMXScreenInfo::beVisuals, _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, DMX_GET_WINDOW_PRIV, dmxDoChangeWindowAttributes(), dmxScreens, and _DMXScreenInfo::scrnWin.

+ +

Referenced by dmxBECreateWindowTree(), and dmxCreateWindow().

+ +
+ + +
+
+ + + + + + - - - +
Bool dmxCreateWindow (WindowPtr  pWindow )  int  what
+
+
+

Create pWindow on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by dmxCreateAndRealizeWindow().

+ +

References _dmxWinPriv::attribMask, _DMXScreenInfo::beDisplay, _dmxWinPriv::cmap, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxCreateNonRootWindow(), dmxCreateRootWindow(), dmxCreateWindow(), dmxGetDefaultWindowAttributes(), dmxLazyWindowCreation, dmxLookupVisualFromID(), dmxResizeRootWindow(), dmxScreens, dmxSync(), dmxUpdateScreenResources(), _dmxWinPriv::hasPict, _DMXScreenInfo::index, _dmxWinPriv::isShaped, _dmxWinPriv::mapped, _dmxWinPriv::offscreen, _dmxWinPriv::restacked, _DMXScreenInfo::rootHeight, _DMXScreenInfo::rootWidth, _DMXScreenInfo::rootWin, _DMXScreenInfo::rootX, _DMXScreenInfo::rootY, _DMXScreenInfo::scrnHeight, _DMXScreenInfo::scrnWidth, _DMXScreenInfo::scrnX, _DMXScreenInfo::scrnY, _dmxWinPriv::visual, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateWindow(), and dmxScreenInit().

+ +
+
+ +
+
+ + + + + + - - -
Bool dmxDestroyWindow (WindowPtr  pWindow )  ) 
-
- - - - - -
-   - - -

-Paint background of pWindow in pRegion.

-

- - - - -
- + +
+

Destroy pWindow on the back-end server. If any RENDER pictures were created, destroy them as well.

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxBEDestroyWindow(), dmxDestroyPictureList(), dmxDestroyWindow(), dmxScreens, and dmxSync().

+ +

Referenced by dmxDestroyWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + +
void dmxPaintWindowBorder ( WindowPtr  pWindow, void dmxGetDefaultWindowAttributes (WindowPtr  pWindow,
RegionPtr  pRegion, Colormap *  cmap,
int  whatVisual **  visual 
) )
+ +
+

References _dmxColormapPriv::cmap, DMX_GET_COLORMAP_PRIV, dmxColormapFromDefaultVisual(), and dmxLookupVisualFromID().

+ +

Referenced by dmxBECreateWindowTree(), and dmxCreateWindow().

+ +
+ + +
+
+ + + + + + + + +
Bool dmxInitWindow (ScreenPtr  pScreen ) 
-
- - - - - -
-   - - -

-Paint window border for pWindow in pRegion.

-

- - - - -
- + +
+

Initialize the private area for the window functions.

+ +

References dmxWinPrivateKey.

+ +

Referenced by dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
Bool dmxPositionWindow ( WindowPtr  pWindow, Bool dmxPositionWindow (WindowPtr  pWindow,
int  x, int  x,
int  yint  y 
) )
-
- - - - - -
-   - - -

-Change the position of pWindow to be x, y.

-

- - - - -
- + +
+

Change the position of pWindow to be x, y.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxPositionWindow(), dmxScreens, dmxSync(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxPositionWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxRealizeWindow ( WindowPtr  pWindow  ) Bool dmxRealizeWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Realize pWindow on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.

-

- - - - -
- + +
+

Realize pWindow on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_REALIZE, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxRealizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxRealizeWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxReparentWindow ( WindowPtr  pWindow, void dmxReparentWindow (WindowPtr  pWindow,
WindowPtr  pPriorParentWindowPtr  pPriorParent 
) )
-
- - - - - -
-   - - -

-Reparent pWindow on the back-end server.

-

- - - - -
- + +
+

Reparent pWindow on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_REPARENT, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxReparentWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), and _dmxWinPriv::window.

+ +

Referenced by dmxReparentWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeRootWindow ( WindowPtr  pRoot, void dmxResizeRootWindow (WindowPtr  pRoot,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  hint  h 
) )
-
- - - - - -
-   - - -

-Change the location and size of the "root" window. Called from #dmxReconfigureRootWindow().

-

- - - - -
- + +
+

Change the location and size of the "root" window. Called from dmxConfigureRootWindow.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, dmxScreens, dmxSync(), _dmxWinPriv::mapped, and _dmxWinPriv::window.

+ +

Referenced by dmxCreateWindow().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeScreenWindow ( ScreenPtr  pScreen, void dmxResizeScreenWindow (ScreenPtr  pScreen,
int  x, int  x,
int  y, int  y,
int  w, int  w,
int  hint  h 
) )
-
- - - - - -
-   - - -

-Change the location and size of the "screen" window. Called from #dmxReconfigureScreenWindow().

-

- - - - -
- + +
+

Change the location and size of the "screen" window. Called from dmxConfigureScreenWindow().

+ +

References _DMXScreenInfo::beDisplay, dmxScreens, dmxSync(), and _DMXScreenInfo::scrnWin.

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void dmxResizeWindow ( WindowPtr  pWindow, void dmxResizeWindow (WindowPtr  pWindow,
int  x, int  x,
int  y, int  y,
unsigned int  w, unsigned int  w,
unsigned int  h, unsigned int  h,
WindowPtr  pSibWindowPtr  pSib 
) )
-
- - - - - -
-   - - -

-Resize pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

-

- - - - -
- + +
+

Resize pWindow on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_RESIZE, DMX_WINDOW_OFFSCREEN, DMX_WRAP, dmxCreateAndRealizeWindow(), dmxResizeWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxResizeWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - + + + + + - - - + + - - + + -
void dmxRestackWindow ( WindowPtr  pWindow, void dmxRestackWindow (WindowPtr  pWindow,
WindowPtr  pOldNextSibWindowPtr  pOldNextSib 
) )
-
- - - - - -
-   - - -

-Handle window restacking. The actual restacking occurs in dmxDoRestackWindow().

-

- - - - -
- + +
+

Handle window restacking. The actual restacking occurs in dmxDoRestackWindow().

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_RESTACK, DMX_WRAP, dmxDoRestackWindow(), dmxRestackWindow(), dmxScreens, dmxSync(), dmxUpdateWindowInfo(), _dmxWinPriv::restacked, and _dmxWinPriv::window.

+ +

Referenced by dmxRestackWindow(), and dmxScreenInit().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void dmxSetShape ( WindowPtr  pWindow  ) void dmxSetShape (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Set shape of pWindow on the back-end server.

-

- - - - -
- + +
+

Set shape of pWindow on the back-end server.

+ +

References DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxDoSetShape(), dmxScreens, dmxSetShape(), dmxSync(), _dmxWinPriv::isShaped, and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxSetShape().

+ +
+ + +
+
+
- - - - - - + + + + + + -
Bool dmxUnrealizeWindow ( WindowPtr  pWindow  ) Bool dmxUnrealizeWindow (WindowPtr  pWindow ) 
-
- - - - - -
-   - - -

-Unrealize pWindow on the back-end server.

-

- - - - -
- + +
+

Unrealize pWindow on the back-end server.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_UPDATE_UNREALIZE, DMX_WRAP, dmxScreens, dmxSync(), dmxUnrealizeWindow(), dmxUpdateWindowInfo(), _dmxWinPriv::mapped, _dmxWinPriv::offscreen, and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxUnrealizeWindow().

+ +
+ + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void dmxWindowExposures ( WindowPtr  pWindow, void dmxWindowExposures (WindowPtr  pWindow,
RegionPtr  prgn, RegionPtr  prgn,
RegionPtr  other_exposedRegionPtr  other_exposed 
) )
-
- - - - - -
-   - - -

-Handle exposures on pWindow. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.

-

Variable Documentation

-

- - - - + + + +
+
+
- - - - -
int dmxWinPrivateIndex + +
+

Handle exposures on pWindow. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.

+ +

References _DMXScreenInfo::beDisplay, DMX_GET_WINDOW_PRIV, DMX_UNWRAP, DMX_WRAP, dmxScreens, dmxSync(), dmxWindowExposurePredicate(), dmxWindowExposures(), and _dmxWinPriv::window.

+ +

Referenced by dmxScreenInit(), and dmxWindowExposures().

+ +
+ +

Variable Documentation

+ +
+
+ + + +
DevPrivateKey dmxWinPrivateKey
-
- - - - - -
-   - - -

-Private index for Windows

+ +
+

Private index.

+
See also:
dmxwindow.c
+
+dmxscrinit.c
+

Private index for Windows

+ +

Referenced by dmxInitWindow().

+ +
+ +
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html new file mode 100644 index 000000000..d04650c6c --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html @@ -0,0 +1,170 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html b/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html index bd64864a1..eebbd60c6 100644 --- a/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html +++ b/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html @@ -6,382 +6,314 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxxinput.c File Reference

#include "X.h"
-#include "Xproto.h"
-#include "inputstr.h"
-#include "XI.h"
-#include "XIproto.h"
-#include "XIstubs.h"
-#include "mipointer.h"
-#include "dmxinputinit.h"
-#include "exevents.h"
- - - - - - - - - - - - - - - - - - - + + +
+

dmxxinput.c File Reference

#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+#include "mipointer.h"
+#include "dmxinputinit.h"
+#include "exevents.h"
+

Functions

int ChangeKeyboardDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev)
int ChangePointerDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)
void CloseInputDevice (DeviceIntPtr d, ClientPtr client)
void AddOtherInputDevices (void)
void OpenInputDevice (DeviceIntPtr dev, ClientPtr client, int *status)
int SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
int SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)
int ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
+ + + + + + + + +

Functions

int ChangeKeyboardDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev)
int ChangePointerDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)
void CloseInputDevice (DeviceIntPtr d, ClientPtr client)
void AddOtherInputDevices (void)
void OpenInputDevice (DeviceIntPtr dev, ClientPtr client, int *status)
int SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
int SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)
int ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
-

Detailed Description

-This file implements support required by the XINPUT extension.

Function Documentation

-

- - - - -
- +

Detailed Description

+

This file implements support required by the XINPUT extension.

+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
void AddOtherInputDevices ( void   ) void AddOtherInputDevices (void  ) 
-
- - - - - -
-   - + +
+

This is not required by the XINPUT model that DMX uses.

-

-This is not required by the XINPUT model that DMX uses.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
int ChangeDeviceControl ( ClientPtr  client, int ChangeDeviceControl (ClientPtr  client,
DeviceIntPtr  dev, DeviceIntPtr  dev,
xDeviceCtl *  controlxDeviceCtl *  control 
) )
-
- - - - - -
-   - + +
+

Change device control. This is not implemented.

-

-Change device control. This is not implemented.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
int ChangeKeyboardDevice ( DeviceIntPtr  old_dev, int ChangeKeyboardDevice (DeviceIntPtr  old_dev,
DeviceIntPtr  new_devDeviceIntPtr  new_dev 
) )
-
- - - - - -
-   - + +
+

Change the core keyboard from old_dev to new_dev. Currently this is not implemented.

-

-Change the core keyboard from old_dev to new_dev. Currently this is not implemented.

-

- - - - -
- +

References dmxLocalCorePointer, _DMXLocalInputInfo::isCore, _DMXLocalInputInfo::savedSendsCore, and _DMXLocalInputInfo::sendsCore.

+ + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + - - + + -
int ChangePointerDevice ( DeviceIntPtr  old_dev, int ChangePointerDevice (DeviceIntPtr  old_dev,
DeviceIntPtr  new_dev, DeviceIntPtr  new_dev,
unsigned char  x, unsigned char  x,
unsigned char  yunsigned char  y 
) )
-
- - - - - -
-   - + +
+

Change the core pointer from old_dev to new_dev.

-

-Change the core pointer from old_dev to new_dev.

-

- - - - -
- +

References dmxLocalCorePointer, _DMXLocalInputInfo::isCore, _DMXLocalInputInfo::savedMotionEvents, _DMXLocalInputInfo::savedMotionProc, _DMXLocalInputInfo::savedSendsCore, and _DMXLocalInputInfo::sendsCore.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void CloseInputDevice ( DeviceIntPtr  d, void CloseInputDevice (DeviceIntPtr  d,
ClientPtr  clientClientPtr  client 
) )
-
- - - - - -
-   - + +
+

Close the input device. This is not required by the XINPUT model that DMX uses.

-

-Close the input device. This is not required by the XINPUT model that DMX uses.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
void OpenInputDevice ( DeviceIntPtr  dev, void OpenInputDevice (DeviceIntPtr  dev,
ClientPtr  client, ClientPtr  client,
int *  statusint *  status 
) )
-
- - - - - -
-   - + +
+

Open an input device. This is not required by the XINPUT model that DMX uses.

-

-Open an input device. This is not required by the XINPUT model that DMX uses.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + - - + + -
int SetDeviceMode ( ClientPtr  client, int SetDeviceMode (ClientPtr  client,
DeviceIntPtr  dev, DeviceIntPtr  dev,
int  modeint  mode 
) )
-
- - - - - -
-   - + +
+

Set device mode to mode. This is not implemented.

-

-Set device mode to mode. This is not implemented.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
int SetDeviceValuators ( ClientPtr  client, int SetDeviceValuators (ClientPtr  client,
DeviceIntPtr  dev, DeviceIntPtr  dev,
int *  valuators, int *  valuators,
int  first_valuator, int  first_valuator,
int  num_valuatorsint  num_valuators 
) )
-
- - - - - -
-   - + +
+

Set device valuators. This is not implemented.

-

-Set device valuators. This is not implemented.

+ + +

diff --git a/xorg-server/hw/dmx/doc/html/files.html b/xorg-server/hw/dmx/doc/html/files.html index 339ba7a98..23ec3c20a 100644 --- a/xorg-server/hw/dmx/doc/html/files.html +++ b/xorg-server/hw/dmx/doc/html/files.html @@ -6,106 +6,122 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

Distributed Multihead X File List

Here is a list of all documented files with brief descriptions: + + +
+

File List

Here is a list of all files with brief descriptions:
- - - - - + + + + + + - + - + - - + + - + - + - + - + - + - + - + - - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - - + + + +
ChkNotMaskEv.c
ChkNotMaskEv.h [code]
programs/Xserver/Xext/dmx.c
lib/dmx/dmx.c
dmx.h [code]
dmx_glxvisuals.h [code]
ChkNotMaskEv.h [code]
dmx-config.h [code]
dmx.c
dmx.h [code]
dmx_glxvisuals.c
dmx_glxvisuals.h [code]
dmxarg.c
dmxarg.h [code]
dmxarg.h [code]
dmxbackend.c
dmxbackend.h [code]
dmxbackend.h [code]
dmxcb.c
dmxcb.h [code]
dmxclient.h [code]
dmxcb.h [code]
dmxclient.h [code]
dmxcmap.c
dmxcmap.h [code]
dmxcmap.h [code]
dmxcommon.c
dmxcommon.h [code]
dmxcommon.h [code]
dmxcompat.c
dmxcompat.h [code]
dmxcompat.h [code]
dmxconfig.c
dmxconfig.h [code]
dmxconfig.h [code]
dmxconsole.c
dmxconsole.h [code]
dmxconsole.h [code]
dmxcursor.c
dmxcursor.h [code]
dmxcursor.h [code]
dmxdetach.c
dmxdpms.c
dmxdpms.h [code]
dmxdpms.h [code]
dmxdummy.c
dmxdummy.h [code]
dmxeq.c
dmxeq.h [code]
dmxdummy.h [code]
dmxevents.c
dmxevents.h [code]
dmxext.h [code]
dmxevents.h [code]
dmxextension.c
dmxextension.h [code]
dmxextension.h [code]
dmxfont.c
dmxfont.h [code]
dmxfont.h [code]
dmxgc.c
dmxgc.h [code]
dmxgc.h [code]
dmxgcops.c
dmxgcops.h [code]
dmxgcops.h [code]
dmxinit.c
dmxinit.h [code]
dmxinit.h [code]
dmxinput.c
dmxinput.h [code]
dmxinput.h [code]
dmxinputinit.c
dmxinputinit.h [code]
dmxinputinit.h [code]
dmxlog.c
dmxlog.h [code]
dmxlog.h [code]
dmxmap.c
dmxmap.h [code]
dmxmap.h [code]
dmxmotion.c
dmxmotion.h [code]
dmxmotion.h [code]
dmxparse.c
dmxparse.h [code]
dmxparse.h [code]
dmxpict.c
dmxpict.h [code]
dmxpict.h [code]
dmxpixmap.c
dmxpixmap.h [code]
dmxpixmap.h [code]
dmxprint.c
dmxprint.h [code]
dmxprint.h [code]
dmxprop.c
dmxprop.h [code]
dmxproto.h [code]
dmxprop.h [code]
dmxscrinit.c
dmxscrinit.h [code]
dmxscrinit.h [code]
dmxshadow.c
dmxshadow.h [code]
dmxshadow.h [code]
dmxsigio.c
dmxsigio.h [code]
dmxsigio.h [code]
dmxstat.c
dmxstat.h [code]
dmxstat.h [code]
dmxsync.c
dmxsync.h [code]
dmxsync.h [code]
dmxtodmx.c
dmxvisual.c
dmxvisual.h [code]
dmxvisual.h [code]
dmxwindow.c
dmxwindow.h [code]
dmxwindow.h [code]
dmxxinput.c
lnx-keyboard.c
lnx-keyboard.h [code]
lnx-keyboard.h [code]
lnx-ms.c
lnx-ms.h [code]
lnx-ms.h [code]
lnx-ps2.c
lnx-ps2.h [code]
lnx-ps2.h [code]
usb-common.c
usb-common.h [code]
usb-common.h [code]
usb-keyboard.c
usb-keyboard.h [code]
usb-keyboard.h [code]
usb-mouse.c
usb-mouse.h [code]
usb-mouse.h [code]
usb-other.c
usb-other.h [code]
usb-private.h [code]
usb-other.h [code]
usb-private.h [code]
vdltodmx.c
xdmxconfig.c
+
diff --git a/xorg-server/hw/dmx/doc/html/functions.html b/xorg-server/hw/dmx/doc/html/functions.html index 766de0f8f..be7974c89 100644 --- a/xorg-server/hw/dmx/doc/html/functions.html +++ b/xorg-server/hw/dmx/doc/html/functions.html @@ -6,223 +6,80 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Variables
-
a | b | c | d | e | f | g | h | i | k | l | m | n | o | p | r | s | t | u | v | w | x
+ + +
+Here is a list of all struct and union fields with links to the structures/unions they belong to: -

- -

-Here is a list of all documented struct and union fields with links to the struct/union documentation for each field:

- a -

+
diff --git a/xorg-server/hw/dmx/doc/html/functions_vars.html b/xorg-server/hw/dmx/doc/html/functions_vars.html index 71c36065d..92fe40193 100644 --- a/xorg-server/hw/dmx/doc/html/functions_vars.html +++ b/xorg-server/hw/dmx/doc/html/functions_vars.html @@ -6,223 +6,80 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Variables
-
a | b | c | d | e | f | g | h | i | k | l | m | n | o | p | r | s | t | u | v | w | x
+ + +
+  -

- -

-

- a -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals.html b/xorg-server/hw/dmx/doc/html/globals.html index 5a81930af..78b3e0401 100644 --- a/xorg-server/hw/dmx/doc/html/globals.html +++ b/xorg-server/hw/dmx/doc/html/globals.html @@ -6,508 +6,96 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
-
a | c | d | e | g | i | k | l | m | o | p | q | s | u | x
+ + +
+Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to: -

- -

-Here is a list of all documented functions, variables, defines, enums, and typedefs with links to the documentation:

- a -

-

- c -

-

- d -

-

- e -

-

- g -

-

- i -

-

- k -

-

- l -

-

- m -

-

- o -

-

- p -

-

- q -

-

- s -

-

- u -

-

- x -

+

- _ -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals_defs.html b/xorg-server/hw/dmx/doc/html/globals_defs.html index 9fb24cc19..78d797125 100644 --- a/xorg-server/hw/dmx/doc/html/globals_defs.html +++ b/xorg-server/hw/dmx/doc/html/globals_defs.html @@ -6,33 +6,72 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
+ + +
+  -

-

+

- a -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals_enum.html b/xorg-server/hw/dmx/doc/html/globals_enum.html index 09cb593d6..98d3be7ef 100644 --- a/xorg-server/hw/dmx/doc/html/globals_enum.html +++ b/xorg-server/hw/dmx/doc/html/globals_enum.html @@ -6,18 +6,73 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
- -

-

+ + +
+  +
diff --git a/xorg-server/hw/dmx/doc/html/globals_eval.html b/xorg-server/hw/dmx/doc/html/globals_eval.html index 15700d509..d73c8cf6a 100644 --- a/xorg-server/hw/dmx/doc/html/globals_eval.html +++ b/xorg-server/hw/dmx/doc/html/globals_eval.html @@ -6,27 +6,204 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
+ + +
+  -

-

+ + +

- p -

+ + +

- u -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals_func.html b/xorg-server/hw/dmx/doc/html/globals_func.html index 85b327b60..d1a02d446 100644 --- a/xorg-server/hw/dmx/doc/html/globals_func.html +++ b/xorg-server/hw/dmx/doc/html/globals_func.html @@ -6,374 +6,88 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
-
a | c | d | g | i | k | l | m | o | p | s | u | x
+ + +
+  -

- -

-

- a -

-

- c -

-

- d -

-

- g -

-

- i -

-

- k -

-

- l -

-

- m -

-

- o -

-

- p -

-

- s -

-

- u -

-

- x -

+

- _ -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals_type.html b/xorg-server/hw/dmx/doc/html/globals_type.html index e3aaeb4ca..8f9ec2b48 100644 --- a/xorg-server/hw/dmx/doc/html/globals_type.html +++ b/xorg-server/hw/dmx/doc/html/globals_type.html @@ -6,82 +6,329 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
-
d | e | m
+ + +
+  -

- -

-

- d -

+ + +

- p -

+ + +

- u -

+
diff --git a/xorg-server/hw/dmx/doc/html/globals_vars.html b/xorg-server/hw/dmx/doc/html/globals_vars.html index c1c2d27c6..778caa815 100644 --- a/xorg-server/hw/dmx/doc/html/globals_vars.html +++ b/xorg-server/hw/dmx/doc/html/globals_vars.html @@ -6,42 +6,600 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-
All | Functions | Variables | Typedefs | Enumerations | Enumeration values | Defines
+ + +
+  -

-

+ + +

- e -

+ + +

- i -

+ + +

- l -

+ + +

- m -

+ + +

- n -

+ + +

- o -

+ + +

- p -

+ + +

- q -

+ + +

- r -

+ + +

- s -

+ + +

- y -

+
diff --git a/xorg-server/hw/dmx/doc/html/index.html b/xorg-server/hw/dmx/doc/html/index.html index 722db1aa5..8c3338217 100644 --- a/xorg-server/hw/dmx/doc/html/index.html +++ b/xorg-server/hw/dmx/doc/html/index.html @@ -1,8 +1,16 @@ - - -Distributed Multihead X + + + + +Distributed Multihead X + - - + + + + <body> + <a href="main.html">Frames are disabled. Click here to go to the main page.</a> + </body> + diff --git a/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html b/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html deleted file mode 100644 index 15bb74a1e..000000000 --- a/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html +++ /dev/null @@ -1,894 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmx.c File Reference

#include <X11/Xlibint.h>
-#include "Xext.h"
-#include "extutil.h"
-#include "dmxproto.h"
-#include "dmxext.h"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Functions

dmx_extension_info Bool DMXQueryExtension (Display *dpy, int *event_basep, int *error_basep)
Bool DMXQueryVersion (Display *dpy, int *majorVersion, int *minorVersion, int *patchVersion)
Bool DMXSync (Display *dpy)
Bool DMXForceWindowCreation (Display *dpy, Window window)
Bool DMXGetScreenCount (Display *dpy, int *screen_count)
Bool DMXGetScreenAttributes (Display *dpy, int physical_screen, DMXScreenAttributes *attr)
int DMXChangeScreensAttributes (Display *dpy, int screen_count, int *screens, int mask_count, unsigned int *masks, DMXScreenAttributes *attrs, int *error_screen)
Bool DMXAddScreen (Display *dpy, const char *displayName, unsigned int mask, DMXScreenAttributes *attr, int *screen)
Bool DMXRemoveScreen (Display *dpy, int screen)
Bool DMXGetWindowAttributes (Display *dpy, Window window, int *screen_count, int available_count, DMXWindowAttributes *inf)
Bool DMXGetDesktopAttributes (Display *dpy, DMXDesktopAttributes *attr)
int DMXChangeDesktopAttributes (Display *dpy, unsigned int mask, DMXDesktopAttributes *attr)
Bool DMXGetInputCount (Display *dpy, int *input_count)
Bool DMXGetInputAttributes (Display *dpy, int id, DMXInputAttributes *inf)
Bool DMXAddInput (Display *dpy, unsigned int mask, DMXInputAttributes *attr, int *id)
Bool DMXAddBackendInput (Display *dpy, int screen, int sendsCore, int *newId)
Bool DMXAddConsoleInput (Display *dpy, const char *name, int sendsCore, int *newId)
Bool DMXRemoveInput (Display *dpy, int id)
-

Detailed Description

-This file implements the client-side part of the DMX protocol. It can be included in client applications by linking with the libdmx.a library.

Function Documentation

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddBackendInput ( Display *  dpy,
int  screen,
int  sendsCore,
int *  newId
) 
-
- - - - - -
-   - - -

-Add backend input (a helper function that calls DMXAddInput).

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddConsoleInput ( Display *  dpy,
const char *  name,
int  sendsCore,
int *  newId
) 
-
- - - - - -
-   - - -

-Add console input (a helper function that calls DMXAddInput).

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddInput ( Display *  dpy,
unsigned int  mask,
DMXInputAttributes *  attr,
int *  id
) 
-
- - - - - -
-   - - -

-Add input.

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXAddScreen ( Display *  dpy,
const char *  displayName,
unsigned int  mask,
DMXScreenAttributes *  attr,
int *  screen
) 
-
- - - - - -
-   - - -

-Add a screen.

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
int DMXChangeDesktopAttributes ( Display *  dpy,
unsigned int  mask,
DMXDesktopAttributes *  attr
) 
-
- - - - - -
-   - - -

-Change the global bounding box and origin offset.

-Available in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int DMXChangeScreensAttributes ( Display *  dpy,
int  screen_count,
int *  screens,
int  mask_count,
unsigned int *  masks,
DMXScreenAttributes *  attrs,
int *  error_screen
) 
-
- - - - - -
-   - - -

-Change geometries and positions of the DMX screen and root windows on the back-end X server.

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXForceWindowCreation ( Display *  dpy,
Window  window
) 
-
- - - - - -
-   - - -

-The creation of the specified window will be forced.

-Available in DMX Protocol Version 1.2 Reply added in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetDesktopAttributes ( Display *  dpy,
DMXDesktopAttributes *  attr
) 
-
- - - - - -
-   - - -

-If the DMXGetDesktopAttributes protocol request returns information correctly, the information will be placed in attr, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetInputAttributes ( Display *  dpy,
int  id,
DMXInputAttributes *  inf
) 
-
- - - - - -
-   - - -

-If the DMXGetInputAttributes protocol request returns information about the input device with the specified id, information about the input device will be placed in inf, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.1

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetInputCount ( Display *  dpy,
int *  input_count
) 
-
- - - - - -
-   - - -

-If the DMXGetInputCount protocol request returns the input count, the value will be placed in input_count, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.1

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetScreenAttributes ( Display *  dpy,
int  physical_screen,
DMXScreenAttributes *  attr
) 
-
- - - - - -
-   - - -

-If the DMXGetScreenAttributes protocol request returns information for the specified physical_screen, information about the screen will be placed in attr, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0; Modified in Version 2.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXGetScreenCount ( Display *  dpy,
int *  screen_count
) 
-
- - - - - -
-   - - -

-If the DMXGetScreenCount protocol request returns the screen count, the value will be placed in screen_count, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXGetWindowAttributes ( Display *  dpy,
Window  window,
int *  screen_count,
int  available_count,
DMXWindowAttributes *  inf
) 
-
- - - - - -
-   - - -

-If the DMXGetWindowAttributes protocol request returns information about the specified window, the number of screens for which information is available will be returned in screen_count and information about the first available_count of those screens will be placed in inf. Because this call transports a great deal of information over the wire, please call DMXGetScreenCount first, and make sure inf is that large.

-Note that if the specified window has not yet been mapped when DMXGetWindowAttributes is called, then a subsequent XMapWindow call might be buffered in xlib while requests directly to the back-end X servers are processed. This race condition can be solved by calling DMXSync before talking directly to the back-end X servers.

-Available in DMX Protocol Version 1.0, but not working correctly until DMX Protocol Version 1.4

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
dmx_extension_info Bool DMXQueryExtension ( Display *  dpy,
int *  event_basep,
int *  error_basep
) 
-
- - - - - -
-   - - -

-If the server has the DMX extension, the event and error bases will be placed in event_basep and error_basep, and True will be returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool DMXQueryVersion ( Display *  dpy,
int *  majorVersion,
int *  minorVersion,
int *  patchVersion
) 
-
- - - - - -
-   - - -

-If the DMXQueryVersion protocol request returns version information from the server, majorVersion, minorVersion, and patchVersion are filled in with the appropriate information and True is returned. Otherwise, False will be returned.

-Available in DMX Protocol Version 1.0

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXRemoveInput ( Display *  dpy,
int  id
) 
-
- - - - - -
-   - - -

-Remove an input.

-

- - - - -
- - - - - - - - - - - - - - - - - - - -
Bool DMXRemoveScreen ( Display *  dpy,
int  screen
) 
-
- - - - - -
-   - - -

-Remove a screen.

-

- - - - -
- - - - - - - - - - -
Bool DMXSync ( Display *  dpy  ) 
-
- - - - - -
-   - - -

-Flush all pending dmxSync requests in DMX server.

-Available in DMX Protocol Version 1.5

-

-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html index e02182b73..05de129c4 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html +++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html @@ -6,497 +6,1244 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-keyboard.c File Reference

#include "dmxinputinit.h"
-#include "lnx-keyboard.h"
-#include "inputstr.h"
-#include "Xos.h"
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/vt.h>
-#include <sys/kd.h>
-#include <termios.h>
-#include "atKeynames.h"
-#include "xf86Keymap.h"
-#include <linux/keyboard.h>
- - - - + + +
+

lnx-keyboard.c File Reference

#include "dmxinputinit.h"
+#include "lnx-keyboard.h"
+#include "inputstr.h"
+#include <X11/Xos.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/vt.h>
+#include <sys/kd.h>
+#include <termios.h>
+#include "atKeynames.h"
+#include <linux/keyboard.h>
+#include <xkbsrv.h>
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define SWITCHRETPROC   dmxVTSwitchReturnProcPtr
#define BLOCK   DMXBlockType
#define MESSAGE   "\033c\n\n\nDMX taking input from this console..."
#define FINALMESSAGE   "\033cDMX terminated."
#define NUM_AT2LNX   (sizeof(at2lnx) / sizeof(at2lnx[0]))
#define NUM_STATE_ENTRIES   (256/32)
#define SYSCALL(call)   while(((call) == -1) && (errno == EINTR))

Typedefs

typedef struct _myPrivate myPrivate

Functions

static int kbdLinuxKeyDown (myPrivate *priv, int keyCode)
static void kbdLinuxKeyState (myPrivate *priv, int type, int keyCode)
pointer kbdLinuxCreatePrivate (DeviceIntPtr pKeyboard)
void kbdLinuxDestroyPrivate (pointer priv)
void kbdLinuxBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
void kbdLinuxCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
static int kbdLinuxGetFreeVTNumber (void)
static int kbdLinuxOpenVT (int vtno)
static int kbdLinuxGetCurrentVTNumber (int fd)
static int kbdLinuxActivate (int fd, int vtno, int setSig)
void kbdLinuxVTPreSwitch (pointer p)
void kbdLinuxVTPostSwitch (pointer p)
int kbdLinuxVTSwitch (pointer p, int vt, void(*switch_return)(pointer), pointer switch_return_data)
static void kbdLinuxVTSignalHandler (int sig)
static void kbdLinuxOpenConsole (DevicePtr pDev)
static void kbdLinuxCloseConsole (DevicePtr pDev)
void kbdLinuxInit (DevicePtr pDev)
static int kbdLinuxPrefix0Mapping (unsigned char *scanCode)
static int kbdLinuxPrefixMapping (myPrivate *priv, unsigned char *scanCode)
static void kbdLinuxConvert (DevicePtr pDev, unsigned char scanCode, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void kbdLinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
int kbdLinuxOn (DevicePtr pDev)
void kbdLinuxOff (DevicePtr pDev)
static void kbdLinuxReadKernelMapping (int fd, KeySymsPtr pKeySyms)
static void kbdLinuxGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
void kbdLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)

Variables

static myPrivate * PRIV = NULL
static KeySym linux_to_x [256]
static unsigned char at2lnx [NUM_KEYCODES]
+

Detailed Description

+

This code implements a low-level device driver for the Linux keyboard. The code is derived from code by Thomas Roell, Orest Zborowski, and David Dawes (see the source code for complete references).

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-

Functions

pointer kbdLinuxCreatePrivate (DeviceIntPtr pKeyboard)
+ + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+ +

-
void kbdLinuxDestroyPrivate (pointer priv)
+ + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+ +

-
void kbdLinuxBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
+ + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+

+
-void kbdLinuxCtrl (DevicePtr pDev, KeybdCtrl *ctrl) +

Referenced by kbdLinuxActivate(), kbdLinuxGetFreeVTNumber(), and kbdLinuxVTSwitch().

-void kbdLinuxVTPreSwitch (pointer p) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+
+
-void kbdLinuxVTPostSwitch (pointer p) +

Referenced by kbdLinuxGetFreeVTNumber(), kbdLinuxInit(), kbdLinuxOn(), msLinuxInit(), msLinuxOn(), ps2LinuxInit(), and usbInit().

-int kbdLinuxVTSwitch (pointer p, int vt, void(*switch_return)(pointer), pointer switch_return_data) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define FATAL2(f,
a,
b  )    dmxLog(dmxFatal,f,a,b)
+
+
-void kbdLinuxInit (DevicePtr pDev) +

Referenced by kbdLinuxOpenVT().

-void kbdLinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block) +
+
+ +
+
+ + + + +
#define FINALMESSAGE   "\033cDMX terminated."
+
+
-int kbdLinuxOn (DevicePtr pDev) +

Referenced by kbdLinuxCloseConsole().

-void kbdLinuxOff (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define GETPRIV
+
+
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+

Referenced by kbdLinuxBell(), kbdLinuxCloseConsole(), kbdLinuxConvert(), kbdLinuxCtrl(), kbdLinuxGetMap(), kbdLinuxInit(), kbdLinuxOff(), kbdLinuxOn(), kbdLinuxOpenConsole(), kbdLinuxRead(), kbdUSBConvert(), kbdUSBCtrl(), kbdUSBOn(), kbdUSBRead(), mouUSBOn(), msLinuxButton(), msLinuxInit(), msLinuxOff(), msLinuxOn(), msLinuxRead(), othUSBGetInfo(), othUSBOn(), ps2LinuxButton(), ps2LinuxInit(), ps2LinuxOff(), ps2LinuxOn(), ps2LinuxRead(), usbInit(), usbOff(), and usbRead().

-void kbdLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + +
#define LOG0(f  )    dmxLog(dmxDebug,f)
+
+
- -

Detailed Description

-This code implements a low-level device driver for the Linux keyboard. The code is derived from code by Thomas Roell, Orest Zborowski, and David Dawes (see the source code for complete references).

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + - - - + + + + + +
void kbdLinuxBell ( DevicePtr  pDev, #define LOG1(f,
int  percent, a  )    dmxLog(dmxDebug,f,a)
+ +
+ +

Referenced by kbdLinuxCloseConsole().

+ +
+ + +
+
+ + + + + + - - - + + - - - + + + + +
#define LOG2(f,
int  volume, a,
int  pitch, b  )    dmxLog(dmxDebug,f,a,b)
+
+
+ +

Referenced by kbdLinuxOpenConsole(), and kbdLinuxVTSignalHandler().

+ +
+
+ +
+
+ + + + + + + + + + + - - + + - - + + + + +
#define LOG3(f,
a,
int  durationb,
) c  )    dmxLog(dmxDebug,f,a,b,c)
+
+
+

Referenced by kbdUSBRead(), and usbRead().

+ +
+
+ +
+
+ + + +
#define MESSAGE   "\033c\n\n\nDMX taking input from this console..."
-
- - - - - -
-   - - -

-Ring the bell.

-Note: we completely ignore the volume, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.

-Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").

-

- - - - -
- + +
+ +

Referenced by kbdLinuxOpenConsole().

+ +
+ + +
+
+
- - - - - - + +
pointer kbdLinuxCreatePrivate ( DeviceIntPtr  pKeyboard  ) #define MOTIONPROC   dmxMotionProcPtr
+ +
+
+ + +
+
+ + + +
#define NUM_AT2LNX   (sizeof(at2lnx) / sizeof(at2lnx[0]))
-
- - - - - -
-   - - -

-Create a private structure for use within this file.

-

- - - - -
- + +
+ +

Referenced by kbdLinuxReadKernelMapping().

+ +
+ + +
+
+
+ + + +
#define NUM_STATE_ENTRIES   (256/32)
+ +
+ +

Referenced by kbdLinuxKeyDown(), kbdLinuxKeyState(), kbdUSBKeyDown(), and kbdUSBKeyState().

+ +
+ + +
+
+ + + + +
#define SWITCHRETPROC   dmxVTSwitchReturnProcPtr
+
+
+ +
+
+ +
+
+ + + + + + + + + +
#define SYSCALL(call  )    while(((call) == -1) && (errno == EINTR))
+
+
+ +

Referenced by kbdLinuxActivate().

+ +
+
+

Typedef Documentation

+ +
+
+ - - - - + +
void kbdLinuxCtrl ( DevicePtr  pDev, typedef struct _myPrivate myPrivate
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + - - + + - - + + -
static int kbdLinuxActivate (int  fd,
int  vtno,
KeybdCtrl *  ctrlint  setSig 
) ) [static]
-
- - - - - -
-   - - -

-Set the LEDs.

-

- - - - -
- + +
+ +

References FATAL0, kbdLinuxVTSignalHandler(), and SYSCALL.

+ +

Referenced by kbdLinuxCloseConsole(), kbdLinuxOpenConsole(), and kbdLinuxVTSwitch().

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + +
void kbdLinuxBell (DevicePtr  pDev,
int  percent,
int  volume,
void kbdLinuxDestroyPrivate ( pointer  priv  ) int  pitch,
int  duration 
)
+ +
+

Ring the bell.

+

Note: we completely ignore the volume, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.

+

Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").

+ +

References GETPRIV.

+
+ + +
+
+ + + + + + + + +
static void kbdLinuxCloseConsole (DevicePtr  pDev )  [static]
-
- - - - - -
-   - - -

-Destroy a private structure.

-

- - - - -
- + +
+ +

References FINALMESSAGE, GETPRIV, kbdLinuxActivate(), and LOG1.

+ +

Referenced by kbdLinuxOff().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + - - + + + + + + + + + + + + + -
void kbdLinuxGetInfo ( DevicePtr  pDev, static void kbdLinuxConvert (DevicePtr  pDev,
unsigned char  scanCode,
DMXLocalInitInfoPtr  infoENQUEUEPROC  enqueue,
) CHECKPROC  checkspecial,
BLOCK  block 
) [static]
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+ +

References GETPRIV, kbdLinuxKeyDown(), kbdLinuxKeyState(), kbdLinuxPrefixMapping(), and MIN_KEYCODE.

+ +

Referenced by kbdLinuxRead().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void kbdLinuxInit ( DevicePtr  pDev  ) pointer kbdLinuxCreatePrivate (DeviceIntPtr  pKeyboard ) 
+ +
+

Create a private structure for use within this file.

+ +

References _myPrivate::fd, and _myPrivate::pKeyboard.

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
void kbdLinuxCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrl 
)
-
- - - - - -
-   - - -

-Initialize the pDev as a Linux keyboard.

-

- - - - -
- + +
+

Set the LEDs.

+ +

References GETPRIV.

+ +
+ + +
+
+
- - - - - - + + + + + + +
void kbdLinuxOff ( DevicePtr  pDev  ) void kbdLinuxDestroyPrivate (pointer  priv ) 
+ +
+

Destroy a private structure.

+
+ + +
+
+ + + + + + + + +
static int kbdLinuxGetCurrentVTNumber (int  fd )  [static]
-
- - - - - -
-   - - -

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- + +
+ +

Referenced by kbdLinuxOpenConsole().

+ +
+ + +
+
+
- - - - - - + + + + + + +
int kbdLinuxOn ( DevicePtr  pDev  ) static int kbdLinuxGetFreeVTNumber (void  )  [static]
+ +
+ +

References FATAL0, and FATAL1.

+ +

Referenced by kbdLinuxOpenConsole().

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
void kbdLinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::kbdFeedbackClass, kbdLinuxGetMap(), _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + + + +
void kbdLinuxRead ( DevicePtr  pDev, static void kbdLinuxGetMap (DevicePtr  pDev,
KeySymsPtr  pKeySyms,
MOTIONPROC  motion, CARD8 *  pModMap 
) [static]
+ +
+ +

References GETPRIV, GLYPHS_PER_KEY, kbdLinuxReadKernelMapping(), map, MAX_KEYCODE, MIN_KEYCODE, and NUM_KEYCODES.

+ +

Referenced by kbdLinuxGetInfo().

+ +
+ + +
+
+ + + + + + + - - +
void kbdLinuxInit (DevicePtr  pDev )  ENQUEUEPROC  enqueue,
+
+
+

Initialize the pDev as a Linux keyboard.

+ +

References FATAL1, GETPRIV, and kbdLinuxOpenConsole().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + + +
static int kbdLinuxKeyDown (myPrivate *  priv,
int  keyCode 
CHECKPROC  checkspecial, ) [static]
+
+
+ +

References _myPrivate::kbdState, and NUM_STATE_ENTRIES.

+ +

Referenced by kbdLinuxConvert(), and kbdUSBConvert().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + - - + + +
static void kbdLinuxKeyState (myPrivate *  priv,
int  type,
BLOCK  blockint  keyCode 
) ) [static]
+
+
+ +

References _myPrivate::kbdState, and NUM_STATE_ENTRIES.

+

Referenced by kbdLinuxConvert().

+ +
+
+ +
+
+ + + + + + + + +
void kbdLinuxOff (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

-

- - - - -
- + +
+

Turn pDev off (i.e., stop taking input from pDev).

+ +

References GETPRIV, and kbdLinuxCloseConsole().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void kbdLinuxVTPostSwitch ( pointer  p  ) int kbdLinuxOn (DevicePtr  pDev ) 
+ +
+

Turn pDev on (i.e., take input from pDev).

+ +

References FATAL1, and GETPRIV.

+
+ + +
+
+ + + + + + + + +
static void kbdLinuxOpenConsole (DevicePtr  pDev )  [static]
-
- - - - - -
-   - - -

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + +
+ +

References GETPRIV, kbdLinuxActivate(), kbdLinuxGetCurrentVTNumber(), kbdLinuxGetFreeVTNumber(), kbdLinuxOpenVT(), LOG2, and MESSAGE.

+ +

Referenced by kbdLinuxInit().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void kbdLinuxVTPreSwitch ( pointer  p  ) static int kbdLinuxOpenVT (int  vtno )  [static]
+ +
+ +

References FATAL2, and O_NONBLOCK.

+ +

Referenced by kbdLinuxOpenConsole().

+
+ + +
+
+ + + + + + + + +
static int kbdLinuxPrefix0Mapping (unsigned char *  scanCode )  [static]
-
- - - - - -
-   - - -

-Currently unused hook called prior to an VT switch.

-

- - - - -
- + +
+ +

Referenced by kbdLinuxPrefixMapping().

+ +
+ + +
+
+
- - - - + + + + + + + + + - - + + + +
int kbdLinuxVTSwitch ( pointer  p, static int kbdLinuxPrefixMapping (myPrivate *  priv,
unsigned char *  scanCode 
int  vt, ) [static]
+ +
+ +

References kbdLinuxPrefix0Mapping(), and _myPrivate::prefix.

+ +

Referenced by kbdLinuxConvert().

+ +
+ + +
+
+ + + + + + + + + + + + - - + + + + + + + + - - + + - - + + +
void kbdLinuxRead (DevicePtr  pDev,
MOTIONPROC  motion,
void(*  switch_return)(pointer), ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
pointer  switch_return_dataBLOCK  block 
) )
+
+
+

Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+

References GETPRIV, and kbdLinuxConvert().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + +
static void kbdLinuxReadKernelMapping (int  fd,
KeySymsPtr  pKeySyms 
) [static]
-
- - - - - -
-   - - -

-Tell the operating system to switch to vt. The switch_return function is called with the switch_return_data when the VT is switched back to the pre-switch VT (i.e., the user returns to the DMX session).

+

+
+ +

References at2lnx, GLYPHS_PER_KEY, linux_to_x, map, and NUM_AT2LNX.

+ +

Referenced by kbdLinuxGetMap().

+ +
+
+ +
+
+ + + + + + + + + +
void kbdLinuxVTPostSwitch (pointer  p ) 
+
+
+

Currently unused hook called after returning from a VT switch.

+ +
+
+ +
+
+ + + + + + + + + +
void kbdLinuxVTPreSwitch (pointer  p ) 
+
+
+

Currently unused hook called prior to an VT switch.

+ +
+
+ +
+
+ + + + + + + + + +
static void kbdLinuxVTSignalHandler (int  sig )  [static]
+
+
+ +

References _myPrivate::fd, LOG2, _myPrivate::switch_return, _myPrivate::switch_return_data, and _myPrivate::switched.

+ +

Referenced by kbdLinuxActivate().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
int kbdLinuxVTSwitch (pointer  p,
int  vt,
void(*)(pointer)  switch_return,
pointer  switch_return_data 
)
+
+
+

Tell the operating system to switch to vt. The switch_return function is called with the switch_return_data when the VT is switched back to the pre-switch VT (i.e., the user returns to the DMX session).

+ +

References FATAL0, _myPrivate::fd, kbdLinuxActivate(), _myPrivate::switch_return, _myPrivate::switch_return_data, _myPrivate::switched, and _myPrivate::vtno.

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
unsigned char at2lnx[NUM_KEYCODES] [static]
+
+
+ +

Referenced by kbdLinuxReadKernelMapping().

+ +
+
+ +
+
+ + + + +
KeySym linux_to_x[256] [static]
+
+
+ +

Referenced by kbdLinuxReadKernelMapping().

+ +
+
+ +
+
+ + + + +
myPrivate* PRIV = NULL [static]
+
+
+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html deleted file mode 100644 index 20330c73a..000000000 --- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-keyboard.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _LNX_KEYBOARD_H_
-00039 #define _LNX_KEYBOARD_H_
-00040 
-00041 extern pointer kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard);
-00042 extern void    kbdLinuxDestroyPrivate(pointer private);
-00043 
-00044 extern void    kbdLinuxInit(DevicePtr pDev);
-00045 extern void    kbdLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00046 extern int     kbdLinuxOn(DevicePtr pDev);
-00047 extern void    kbdLinuxOff(DevicePtr pDev);
-00048 
-00049 extern void    kbdLinuxVTPreSwitch(pointer p);
-00050 extern void    kbdLinuxVTPostSwitch(pointer p);
-00051 extern int     kbdLinuxVTSwitch(pointer p, int vt,
-00052                                 dmxVTSwitchReturnProcPtr switch_return,
-00053                                 pointer switch_return_data);
-00054 
-00055 extern void    kbdLinuxRead(DevicePtr pDev,
-00056                             dmxMotionProcPtr motion,
-00057                             dmxEnqueueProcPtr enqueue,
-00058                             dmxCheckSpecialProcPtr checkspecial,
-00059                             DMXBlockType block);
-00060 
-00061 extern void    kbdLinuxCtrl(DevicePtr pDev, KeybdCtrl *ctrl);
-00062 extern void    kbdLinuxBell(DevicePtr pDev, int percent,
-00063                             int volume, int pitch, int duration);
-00064 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html index 4811cad59..3698b18d7 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html +++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html @@ -6,374 +6,380 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

lnx-keyboard.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer kbdLinuxCreatePrivate (DeviceIntPtr pKeyboard)
void kbdLinuxDestroyPrivate (pointer private)
void kbdLinuxInit (DevicePtr pDev)
void kbdLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int kbdLinuxOn (DevicePtr pDev)
void kbdLinuxOff (DevicePtr pDev)
void kbdLinuxVTPreSwitch (pointer p)
void kbdLinuxVTPostSwitch (pointer p)
void kbdLinuxCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void kbdLinuxBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
+ + + + + + + + + + + + +

Functions

pointer kbdLinuxCreatePrivate (DeviceIntPtr pKeyboard)
void kbdLinuxDestroyPrivate (pointer private)
void kbdLinuxInit (DevicePtr pDev)
void kbdLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int kbdLinuxOn (DevicePtr pDev)
void kbdLinuxOff (DevicePtr pDev)
void kbdLinuxVTPreSwitch (pointer p)
void kbdLinuxVTPostSwitch (pointer p)
int kbdLinuxVTSwitch (pointer p, int vt, dmxVTSwitchReturnProcPtr switch_return, pointer switch_return_data)
void kbdLinuxRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void kbdLinuxCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void kbdLinuxBell (DevicePtr pDev, int percent, int volume, int pitch, int duration)
-

Detailed Description

-Interface to Linux keyboard driver.
See also:
lnx-keyboard.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to Linux keyboard driver.

+
See also:
lnx-keyboard.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + - - + + -
void kbdLinuxBell ( DevicePtr  pDev, void kbdLinuxBell (DevicePtr  pDev,
int  percent, int  percent,
int  volume, int  volume,
int  pitch, int  pitch,
int  durationint  duration 
) )
-
- - - - - -
-   - + +
+

Ring the bell.

+

Note: we completely ignore the volume, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.

+

Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").

-

-Ring the bell.

-Note: we completely ignore the volume, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.

-Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").

-

- - - - -
- +

References GETPRIV.

+ + + + +
+
+
- - - - - - + + + + + + -
pointer kbdLinuxCreatePrivate ( DeviceIntPtr  pKeyboard  ) pointer kbdLinuxCreatePrivate (DeviceIntPtr  pKeyboard ) 
-
- - - - - -
-   - + +
+

Create a private structure for use within this file.

-

-Create a private structure for use within this file.

-

- - - - -
- +

References _myPrivate::fd, and _myPrivate::pKeyboard.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void kbdLinuxCtrl ( DevicePtr  pDev, void kbdLinuxCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrlKeybdCtrl *  ctrl 
) )
-
- - - - - -
-   - + +
+

Set the LEDs.

-

-Set the LEDs.

-

- - - - -
- +

References GETPRIV.

+ + + + +
+
+
- - - - - - + + + + + + -
void kbdLinuxDestroyPrivate ( pointer  priv  ) void kbdLinuxDestroyPrivate (pointer  priv ) 
-
- - - - - -
-   - + +
+

Destroy a private structure.

-

-Destroy a private structure.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void kbdLinuxGetInfo ( DevicePtr  pDev, void kbdLinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Fill the info structure with information needed to initialize pDev.

-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::kbdFeedbackClass, kbdLinuxGetMap(), _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, and _DMXLocalInitInfo::modMap.

+ + + + +
+
+
- - - - - - + + + + + + -
void kbdLinuxInit ( DevicePtr  pDev  ) void kbdLinuxInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize the pDev as a Linux keyboard.

-

-Initialize the pDev as a Linux keyboard.

-

- - - - -
- +

References FATAL1, GETPRIV, and kbdLinuxOpenConsole().

+ + + + +
+
+
- - - - - - + + + + + + -
void kbdLinuxOff ( DevicePtr  pDev  ) void kbdLinuxOff (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev off (i.e., stop taking input from pDev).

-

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- +

References GETPRIV, and kbdLinuxCloseConsole().

+ + + + +
+
+
- - - - - - + + + + + + -
int kbdLinuxOn ( DevicePtr  pDev  ) int kbdLinuxOn (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev on (i.e., take input from pDev).

-

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- +

References FATAL1, and GETPRIV.

+ + + + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void kbdLinuxVTPostSwitch ( pointer  p  ) void kbdLinuxRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
+ +
+
+ + +
+
+ + + + + + + + +
void kbdLinuxVTPostSwitch (pointer  p ) 
-
- - - - - -
-   - + +
+

Currently unused hook called after returning from a VT switch.

-

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
void kbdLinuxVTPreSwitch ( pointer  p  ) void kbdLinuxVTPreSwitch (pointer  p ) 
+ +
+

Currently unused hook called prior to an VT switch.

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
int kbdLinuxVTSwitch (pointer  p,
int  vt,
dmxVTSwitchReturnProcPtr  switch_return,
pointer  switch_return_data 
)
-
- - - - - -
-   - + +
-

-Currently unused hook called prior to an VT switch.

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html new file mode 100644 index 000000000..d29a1a785 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html @@ -0,0 +1,96 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html index e77e562a4..25ba6260a 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html +++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html @@ -6,338 +6,706 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-ms.c File Reference

#include "inputstr.h"
-#include "Xos.h"
-#include <errno.h>
-#include <termios.h>
-#include "dmxinputinit.h"
-#include "lnx-ms.h"
- - - - + + +
+

lnx-ms.c File Reference

#include "inputstr.h"
+#include <X11/Xos.h>
+#include <errno.h>
+#include <termios.h>
+#include "dmxinputinit.h"
+#include "lnx-ms.h"
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType
#define PRESS(b)
#define RELEASE(b)

Typedefs

typedef struct _myPrivate myPrivate

Functions

static int msLinuxReadBytes (int fd, unsigned char *buf, int len, int min)
static void msLinuxButton (DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)
void msLinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void msLinuxInit (DevicePtr pDev)
int msLinuxOn (DevicePtr pDev)
void msLinuxOff (DevicePtr pDev)
static void msLinuxGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
void msLinuxVTPreSwitch (pointer p)
void msLinuxVTPostSwitch (pointer p)
pointer msLinuxCreatePrivate (DeviceIntPtr pMouse)
void msLinuxDestroyPrivate (pointer priv)
void msLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+

Detailed Description

+

This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Juliusz Chroboczek and Keith Packard (see the source code for complete references).

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-

Functions

-void msLinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block) +
+
+ +
+
+ + + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+
+
-void msLinuxInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-int msLinuxOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
-void msLinuxOff (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+
+
-void msLinuxVTPreSwitch (pointer p) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define FATAL2(f,
a,
b  )    dmxLog(dmxFatal,f,a,b)
+
+
-void msLinuxVTPostSwitch (pointer p) +
+
+ +
+
+ + + + +
#define GETPRIV
+
+
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+
+ +
+
+ + + + + + + + + +
#define LOG0(f  )    dmxLog(dmxDebug,f)
+
+
-pointer msLinuxCreatePrivate (DeviceIntPtr pMouse) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define LOG1(f,
a  )    dmxLog(dmxDebug,f,a)
+
+
-void msLinuxDestroyPrivate (pointer priv) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define LOG2(f,
a,
b  )    dmxLog(dmxDebug,f,a,b)
+
+
-void msLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
#define LOG3(f,
a,
b,
c  )    dmxLog(dmxDebug,f,a,b,c)
+
+
- -

Detailed Description

-This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Juliusz Chroboczek and Keith Packard (see the source code for complete references).

Function Documentation

-

- - - - -
- - - - - - - - + + + +
+
+
pointer msLinuxCreatePrivate ( DeviceIntPtr  pMouse  ) 
+ + +
#define MOTIONPROC   dmxMotionProcPtr
+ +
+
+ + +
+
+ + + + + + + + +
#define PRESS(b  ) 
-
- - - - - -
-   - - -

-Create a private structure for use within this file.

-

- - - - -
- + +
+Value:
do {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } while (0)
+
+

Referenced by msLinuxButton(), ps2LinuxButton(), and usbRead().

+ +
+ + +
+
+
- - - - - - + + + + + + +
void msLinuxDestroyPrivate ( pointer  priv  ) #define RELEASE(b  ) 
+ +
+Value:
do {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } while (0)
+
+

Referenced by msLinuxButton(), ps2LinuxButton(), and usbRead().

+
+ +

Typedef Documentation

+ +
+
+ + + +
typedef struct _myPrivate myPrivate
-
- - - - - -
-   - - -

-Destroy a private structure.

-

- - - - -
- + +
+ +
+ +

Function Documentation

+ +
+
+
- - - - + + + + + + + + + + + + + + + + - - + + - - + + +
void msLinuxGetInfo ( DevicePtr  pDev, static void msLinuxButton (DevicePtr  pDev,
ENQUEUEPROC  enqueue,
int  buttons,
DMXLocalInitInfoPtr  infoBLOCK  block 
) ) [static]
+ +
+ +

References GETPRIV, PRESS, and RELEASE.

+ +

Referenced by msLinuxRead().

+
+ + +
+
+ + + + + + + + +
pointer msLinuxCreatePrivate (DeviceIntPtr  pMouse ) 
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+

Create a private structure for use within this file.

+ +

References _myPrivate::fd, and _myPrivate::pMouse.

+ +
+ + +
+
+
- - - - - - + + + + + + +
void msLinuxInit ( DevicePtr  pDev  ) void msLinuxDestroyPrivate (pointer  priv ) 
+ +
+

Destroy a private structure.

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
void msLinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
-
- - - - - -
-   - - -

-Initialize pDev.

-

- - - - -
- + +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, msLinuxGetMap(), _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + +
static void msLinuxGetMap (DevicePtr  pDev,
unsigned char *  map,
int *  nButtons 
void msLinuxOff ( DevicePtr  pDev  ) ) [static]
+ +
+

Referenced by msLinuxGetInfo().

+ +
+ + +
+
+ + + + + + + + +
void msLinuxInit (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- + +
+

Initialize pDev.

+ +

References FATAL1, GETPRIV, and O_NONBLOCK.

+ +

Referenced by msLinuxOn().

+ +
+ + +
+
+
- - - - - - + + + + + + +
int msLinuxOn ( DevicePtr  pDev  ) void msLinuxOff (DevicePtr  pDev ) 
+ +
+

Turn pDev off (i.e., stop taking input from pDev).

+ +

References GETPRIV.

+
+ + +
+
+ + + + + + + + +
int msLinuxOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References FATAL1, GETPRIV, and msLinuxInit().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + + + + + + - - + + + + + +
void msLinuxRead ( DevicePtr  pDev, void msLinuxRead (DevicePtr  pDev,
MOTIONPROC  motion,
MOTIONPROC  motion, ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
ENQUEUEPROC  enqueue, BLOCK  block 
)
+ +
+

Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+ +

References GETPRIV, msLinuxButton(), and msLinuxReadBytes().

+ +
+ + +
+
+ + + + + + + + + - - + + + + + + + + - - + + - - + + -
static int msLinuxReadBytes (int  fd,
CHECKPROC  checkspecial, unsigned char *  buf,
int  len,
BLOCK  blockint  min 
) ) [static]
-
- - - - - -
-   - - -

-Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

-

- - - - -
- + +
+ +

Referenced by msLinuxRead().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void msLinuxVTPostSwitch ( pointer  p  ) void msLinuxVTPostSwitch (pointer  p ) 
-
- - - - - -
-   - - -

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + +
+

Currently unused hook called after returning from a VT switch.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void msLinuxVTPreSwitch ( pointer  p  ) void msLinuxVTPreSwitch (pointer  p ) 
-
- - - - - -
-   - - -

-Currently unused hook called prior to an VT switch.

+

+
+

Currently unused hook called prior to an VT switch.

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html deleted file mode 100644 index c900c32b2..000000000 --- a/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-ms.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _LNX_MS_H_
-00039 #define _LNX_MS_H_
-00040 
-00041 extern pointer msLinuxCreatePrivate(DeviceIntPtr pMouse);
-00042 extern void    msLinuxDestroyPrivate(pointer priv);
-00043 extern void    msLinuxRead(DevicePtr pDev,
-00044                            dmxMotionProcPtr motion,
-00045                            dmxEnqueueProcPtr enqueue,
-00046                            dmxCheckSpecialProcPtr checkspecial,
-00047                            DMXBlockType block);
-00048 extern void    msLinuxInit(DevicePtr pDev);
-00049 extern void    msLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00050 extern int     msLinuxOn(DevicePtr pDev);
-00051 extern void    msLinuxOff(DevicePtr pDev);
-00052 extern void    msLinuxCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00053 extern void    msLinuxVTPreSwitch(pointer p);
-00054 extern void    msLinuxVTPostSwitch(pointer p);
-00055 
-00056 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html index 3bd06c193..0f926cbb5 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html +++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html @@ -6,274 +6,288 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

lnx-ms.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer msLinuxCreatePrivate (DeviceIntPtr pMouse)
void msLinuxDestroyPrivate (pointer priv)
void msLinuxInit (DevicePtr pDev)
void msLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int msLinuxOn (DevicePtr pDev)
void msLinuxOff (DevicePtr pDev)
void msLinuxVTPreSwitch (pointer p)
void msLinuxVTPostSwitch (pointer p)
+ + + + + + + + + + +

Functions

pointer msLinuxCreatePrivate (DeviceIntPtr pMouse)
void msLinuxDestroyPrivate (pointer priv)
void msLinuxRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void msLinuxInit (DevicePtr pDev)
void msLinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int msLinuxOn (DevicePtr pDev)
void msLinuxOff (DevicePtr pDev)
void msLinuxCtrl (DevicePtr pDev, PtrCtrl *ctrl)
void msLinuxVTPreSwitch (pointer p)
void msLinuxVTPostSwitch (pointer p)
-

Detailed Description

-Interface to Linux MS mouse driver.
See also:
lnx-ms.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to Linux MS mouse driver.

+
See also:
lnx-ms.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
pointer msLinuxCreatePrivate ( DeviceIntPtr  pMouse  ) pointer msLinuxCreatePrivate (DeviceIntPtr  pMouse ) 
-
- - - - - -
-   - + +
+

Create a private structure for use within this file.

-

-Create a private structure for use within this file.

-

- - - - -
- +

References _myPrivate::fd, and _myPrivate::pMouse.

+ + + + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
void msLinuxCtrl (DevicePtr  pDev,
PtrCtrl *  ctrl 
void msLinuxDestroyPrivate ( pointer  priv  ) )
+ +
+
+ + +
+
+ + + + + + + + +
void msLinuxDestroyPrivate (pointer  priv ) 
-
- - - - - -
-   - + +
+

Destroy a private structure.

-

-Destroy a private structure.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void msLinuxGetInfo ( DevicePtr  pDev, void msLinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Fill the info structure with information needed to initialize pDev.

-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- +

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, msLinuxGetMap(), _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ + + + +
+
+
- - - - - - + + + + + + -
void msLinuxInit ( DevicePtr  pDev  ) void msLinuxInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize pDev.

-

-Initialize pDev.

-

- - - - -
- +

References FATAL1, GETPRIV, and O_NONBLOCK.

+ +

Referenced by msLinuxOn().

+ + + + +
+
+
- - - - - - + + + + + + -
void msLinuxOff ( DevicePtr  pDev  ) void msLinuxOff (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev off (i.e., stop taking input from pDev).

-

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- +

References GETPRIV.

+ + + + +
+
+
- - - - - - + + + + + + -
int msLinuxOn ( DevicePtr  pDev  ) int msLinuxOn (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev on (i.e., take input from pDev).

-

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- +

References FATAL1, GETPRIV, and msLinuxInit().

+ + + + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
void msLinuxVTPostSwitch ( pointer  p  ) void msLinuxRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
void msLinuxVTPreSwitch ( pointer  p  ) void msLinuxVTPostSwitch (pointer  p ) 
+ +
+

Currently unused hook called after returning from a VT switch.

+
+ + +
+
+ + + + + + + + +
void msLinuxVTPreSwitch (pointer  p ) 
-
- - - - - -
-   - + +
+

Currently unused hook called prior to an VT switch.

-

-Currently unused hook called prior to an VT switch.

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html new file mode 100644 index 000000000..9fcb934a0 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html @@ -0,0 +1,88 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html index f0e44c742..da61a904b 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html +++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html @@ -6,338 +6,702 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-ps2.c File Reference

#include "inputstr.h"
-#include "Xos.h"
-#include <errno.h>
-#include <termios.h>
-#include "dmxinputinit.h"
-#include "lnx-ps2.h"
- - - - + + +
+

lnx-ps2.c File Reference

#include "inputstr.h"
+#include <X11/Xos.h>
+#include <errno.h>
+#include <termios.h>
+#include "dmxinputinit.h"
+#include "lnx-ps2.h"
+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType
#define PRESS(b)
#define RELEASE(b)

Typedefs

typedef struct _myPrivate myPrivate

Functions

static int ps2LinuxReadBytes (int fd, unsigned char *buf, int len, int min)
static void ps2LinuxButton (DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)
void ps2LinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void ps2LinuxInit (DevicePtr pDev)
int ps2LinuxOn (DevicePtr pDev)
void ps2LinuxOff (DevicePtr pDev)
static void ps2LinuxGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
void ps2LinuxVTPreSwitch (pointer p)
void ps2LinuxVTPostSwitch (pointer p)
pointer ps2LinuxCreatePrivate (DeviceIntPtr pMouse)
void ps2LinuxDestroyPrivate (pointer priv)
void ps2LinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+

Detailed Description

+

This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Keith Packard (see the source code for complete references).

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-

Functions

-void ps2LinuxRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block) +
+
+ +
+
+ + + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+
+
-void ps2LinuxInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-int ps2LinuxOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
-void ps2LinuxOff (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+
+
-void ps2LinuxVTPreSwitch (pointer p) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define FATAL2(f,
a,
b  )    dmxLog(dmxFatal,f,a,b)
+
+
-void ps2LinuxVTPostSwitch (pointer p) +
+
+ +
+
+ + + + +
#define GETPRIV
+
+
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+
+ +
+
+ + + + + + + + + +
#define LOG0(f  )    dmxLog(dmxDebug,f)
+
+
-pointer ps2LinuxCreatePrivate (DeviceIntPtr pMouse) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define LOG1(f,
a  )    dmxLog(dmxDebug,f,a)
+
+
-void ps2LinuxDestroyPrivate (pointer priv) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
#define LOG2(f,
a,
b  )    dmxLog(dmxDebug,f,a,b)
+
+
-void ps2LinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
#define LOG3(f,
a,
b,
c  )    dmxLog(dmxDebug,f,a,b,c)
+
+
- -

Detailed Description

-This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Keith Packard (see the source code for complete references).

Function Documentation

-

- - - - -
- - - - - - - - + + + +
+
+
pointer ps2LinuxCreatePrivate ( DeviceIntPtr  pMouse  ) 
+ + +
#define MOTIONPROC   dmxMotionProcPtr
+ +
+
+ + +
+
+ + + + + + + + +
#define PRESS(b  ) 
-
- - - - - -
-   - - -

-Create a private structure for use within this file.

-

- - - - -
- + +
+Value:
do {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } while (0)
+
+
+ + +
+
+
- - - - - - + + + + + + -
void ps2LinuxDestroyPrivate ( pointer  priv  ) #define RELEASE(b  ) 
-
- - - - - -
-   - - -

-Destroy a private structure.

-

- - - - -
- + +
+Value:
do {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } while (0)
+
+
+ +

Typedef Documentation

+ +
+
+
+ + + +
typedef struct _myPrivate myPrivate
+ +
+ +
+ +

Function Documentation

+ +
+
+ - - - - + + + + + + + + + + + + + + + + - - + + - - + + +
void ps2LinuxGetInfo ( DevicePtr  pDev, static void ps2LinuxButton (DevicePtr  pDev,
ENQUEUEPROC  enqueue,
int  buttons,
DMXLocalInitInfoPtr  infoBLOCK  block 
) ) [static]
+
+
+ +

References GETPRIV, PRESS, and RELEASE.

+ +

Referenced by ps2LinuxRead().

+
+
+ +
+
+ + + + + + + + +
pointer ps2LinuxCreatePrivate (DeviceIntPtr  pMouse ) 
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+

Create a private structure for use within this file.

+ +

References _myPrivate::fd, and _myPrivate::pMouse.

+ +
+ + +
+
+
- - - - - - + + + + + + +
void ps2LinuxInit ( DevicePtr  pDev  ) void ps2LinuxDestroyPrivate (pointer  priv ) 
+ +
+

Destroy a private structure.

+
+ + +
+
+ + + + + + + + + + + + + + + + + +
void ps2LinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
)
-
- - - - - -
-   - - -

-Initialize pDev.

-

- - - - -
- + +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, ps2LinuxGetMap(), _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + - - - - - - + + + +
static void ps2LinuxGetMap (DevicePtr  pDev,
unsigned char *  map,
int *  nButtons 
void ps2LinuxOff ( DevicePtr  pDev  ) ) [static]
+ +
+

Referenced by ps2LinuxGetInfo().

+ +
+ + +
+
+ + + + + + + + +
void ps2LinuxInit (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- + +
+

Initialize pDev.

+ +

References FATAL1, GETPRIV, and O_NONBLOCK.

+ +

Referenced by ps2LinuxOn().

+ +
+ + +
+
+
- - - - - - + + + + + + +
int ps2LinuxOn ( DevicePtr  pDev  ) void ps2LinuxOff (DevicePtr  pDev ) 
+ +
+

Turn pDev off (i.e., stop taking input from pDev).

+ +

References GETPRIV.

+
+ + +
+
+ + + + + + + + +
int ps2LinuxOn (DevicePtr  pDev ) 
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and ps2LinuxInit().

+ +
+ + +
+
+
- - - - + + + + + + + + + + - - + + + + + + + + - - + + + + + +
void ps2LinuxRead ( DevicePtr  pDev, void ps2LinuxRead (DevicePtr  pDev,
MOTIONPROC  motion,
MOTIONPROC  motion, ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
ENQUEUEPROC  enqueue, BLOCK  block 
)
+ +
+

Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+ +

References GETPRIV, ps2LinuxButton(), and ps2LinuxReadBytes().

+ +
+ + +
+
+ + + + + + + + + - - + + + + + + + + - - + + - - + + -
static int ps2LinuxReadBytes (int  fd,
CHECKPROC  checkspecial, unsigned char *  buf,
int  len,
BLOCK  blockint  min 
) ) [static]
-
- - - - - -
-   - - -

-Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

-

- - - - -
- + +
+ +

Referenced by ps2LinuxRead().

+ +
+ + +
+
+
- - - - - - + + + + + + -
void ps2LinuxVTPostSwitch ( pointer  p  ) void ps2LinuxVTPostSwitch (pointer  p ) 
-
- - - - - -
-   - - -

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + +
+

Currently unused hook called after returning from a VT switch.

+ +
+ + +
+
+
- - - - - - + + + + + + -
void ps2LinuxVTPreSwitch ( pointer  p  ) void ps2LinuxVTPreSwitch (pointer  p ) 
-
- - - - - -
-   - - -

-Currently unused hook called prior to an VT switch.

+

+
+

Currently unused hook called prior to an VT switch.

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html deleted file mode 100644 index f4f76a04e..000000000 --- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

lnx-ps2.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2001 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _LNX_PS2_H_
-00039 #define _LNX_PS2_H_
-00040 
-00041 extern pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse);
-00042 extern void    ps2LinuxDestroyPrivate(pointer priv);
-00043 extern void    ps2LinuxRead(DevicePtr pDev,
-00044                             dmxMotionProcPtr motion,
-00045                             dmxEnqueueProcPtr enqueue,
-00046                             dmxCheckSpecialProcPtr checkspecial,
-00047                             DMXBlockType block);
-00048 extern void    ps2LinuxInit(DevicePtr pDev);
-00049 extern void    ps2LinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00050 extern int     ps2LinuxOn(DevicePtr pDev);
-00051 extern void    ps2LinuxOff(DevicePtr pDev);
-00052 extern void    ps2LinuxCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00053 extern void    ps2LinuxVTPreSwitch(pointer p);
-00054 extern void    ps2LinuxVTPostSwitch(pointer p);
-00055 
-00056 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html index 2723f9c60..0b86b1c4d 100644 --- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html +++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html @@ -6,274 +6,288 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

lnx-ps2.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer ps2LinuxCreatePrivate (DeviceIntPtr pMouse)
void ps2LinuxDestroyPrivate (pointer priv)
void ps2LinuxInit (DevicePtr pDev)
void ps2LinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int ps2LinuxOn (DevicePtr pDev)
void ps2LinuxOff (DevicePtr pDev)
void ps2LinuxVTPreSwitch (pointer p)
void ps2LinuxVTPostSwitch (pointer p)
+ + + + + + + + + + +

Functions

pointer ps2LinuxCreatePrivate (DeviceIntPtr pMouse)
void ps2LinuxDestroyPrivate (pointer priv)
void ps2LinuxRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void ps2LinuxInit (DevicePtr pDev)
void ps2LinuxGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int ps2LinuxOn (DevicePtr pDev)
void ps2LinuxOff (DevicePtr pDev)
void ps2LinuxCtrl (DevicePtr pDev, PtrCtrl *ctrl)
void ps2LinuxVTPreSwitch (pointer p)
void ps2LinuxVTPostSwitch (pointer p)
-

Detailed Description

-Interface to Linux PS/2 mouse driver.
See also:
lnx-ps2.c
-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to Linux PS/2 mouse driver.

+
See also:
lnx-ps2.c
+

Function Documentation

+ +
+
+
- - - - - - + + + + + + -
pointer ps2LinuxCreatePrivate ( DeviceIntPtr  pMouse  ) pointer ps2LinuxCreatePrivate (DeviceIntPtr  pMouse ) 
-
- - - - - -
-   - + +
+

Create a private structure for use within this file.

-

-Create a private structure for use within this file.

-

- - - - -
- +

References _myPrivate::fd, and _myPrivate::pMouse.

+ + + + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
void ps2LinuxCtrl (DevicePtr  pDev,
PtrCtrl *  ctrl 
void ps2LinuxDestroyPrivate ( pointer  priv  ) )
+ +
+
+ + +
+
+ + + + + + + + +
void ps2LinuxDestroyPrivate (pointer  priv ) 
-
- - - - - -
-   - + +
+

Destroy a private structure.

-

-Destroy a private structure.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void ps2LinuxGetInfo ( DevicePtr  pDev, void ps2LinuxGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Fill the info structure with information needed to initialize pDev.

-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- +

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, ps2LinuxGetMap(), _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ + + + +
+
+
- - - - - - + + + + + + -
void ps2LinuxInit ( DevicePtr  pDev  ) void ps2LinuxInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize pDev.

-

-Initialize pDev.

-

- - - - -
- +

References FATAL1, GETPRIV, and O_NONBLOCK.

+ +

Referenced by ps2LinuxOn().

+ + + + +
+
+
- - - - - - + + + + + + -
void ps2LinuxOff ( DevicePtr  pDev  ) void ps2LinuxOff (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev off (i.e., stop taking input from pDev).

-

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- +

References GETPRIV.

+ + + + +
+
+
- - - - - - + + + + + + -
int ps2LinuxOn ( DevicePtr  pDev  ) int ps2LinuxOn (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Turn pDev on (i.e., take input from pDev).

-

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- +

References GETPRIV, and ps2LinuxInit().

+ + + + +
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
void ps2LinuxVTPostSwitch ( pointer  p  ) void ps2LinuxRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Currently unused hook called after returning from a VT switch.

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + +
void ps2LinuxVTPreSwitch ( pointer  p  ) void ps2LinuxVTPostSwitch (pointer  p ) 
+ +
+

Currently unused hook called after returning from a VT switch.

+
+ + +
+
+ + + + + + + + +
void ps2LinuxVTPreSwitch (pointer  p ) 
-
- - - - - -
-   - + +
+

Currently unused hook called prior to an VT switch.

-

-Currently unused hook called prior to an VT switch.

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html new file mode 100644 index 000000000..5cc89aadc --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html @@ -0,0 +1,88 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/main.html b/xorg-server/hw/dmx/doc/html/main.html index 86ee52bea..8dd9c3b2c 100644 --- a/xorg-server/hw/dmx/doc/html/main.html +++ b/xorg-server/hw/dmx/doc/html/main.html @@ -6,12 +6,24 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

Distributed Multihead X Documentation

-

-

dmx-1-2-20040604 and later

+ + +
+

Distributed Multihead X Documentation

dmx-1-2-20040604 and later

+
diff --git a/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html b/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html deleted file mode 100644 index d9fefed76..000000000 --- a/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmx.c File Reference

#include "X.h"
-#include "Xproto.h"
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "opaque.h"
-#include "dmxextension.h"
-#include "dmxproto.h"
-#include "dmxext.h"
- - - - - -

Functions

void DMXExtensionInit (void)
-

Detailed Description

-This file implements the server-side part of the DMX protocol. A vector of fucntions is provided at extension initialization time, so most all of the useful functions in this file are declared static and do not appear in the doxygen documentation.

-Much of the low-level work is done by functions in #dmxextension.c

-Please see the Client-to-Server DMX Extension to the X Protocol document for details about the protocol.

Function Documentation

-

- - - - -
- - - - - - - - - - -
void DMXExtensionInit ( void   ) 
-
- - - - - -
-   - - -

-Initialize the extension.

-

-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html b/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html index 5e1929147..1c3094f47 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html +++ b/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html @@ -6,16 +6,114 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXConfigCmdStruct Struct Reference

- + + +
+

DMXConfigCmdStruct Struct Reference

+ + + + + +

Data Fields

const char * filename
const char * config
DMXConfigList * displays
DMXConfigList * inputs
DMXConfigList * xinputs
-

Detailed Description

-This stucture stores the parsed configuration information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

This stucture stores the parsed configuration information.

+

Field Documentation

+ +
+
+ + + + +
const char* DMXConfigCmdStruct::config
+
+
+ +

Referenced by dmxConfigConfigure(), dmxConfigFromConfigFile(), dmxConfigMatch(), and dmxConfigStoreConfig().

+ +
+
+ +
+
+ + + + +
DMXConfigList* DMXConfigCmdStruct::displays
+
+
+ +

Referenced by dmxConfigConfigure(), dmxConfigFromCommandLine(), and dmxConfigStoreDisplay().

+ +
+
+ +
+
+ + + + +
const char* DMXConfigCmdStruct::filename
+
+
+ +

Referenced by dmxConfigConfigure(), dmxConfigFromConfigFile(), dmxConfigSetMaxScreens(), and dmxConfigStoreFile().

+ +
+
+ +
+
+ + + + +
DMXConfigList* DMXConfigCmdStruct::inputs
+
+
+ +

Referenced by dmxConfigConfigInputs(), and dmxConfigStoreInput().

+ +
+
+ +
+
+ + + + +
DMXConfigList* DMXConfigCmdStruct::xinputs
+
+
+ +

Referenced by dmxConfigConfigInputs(), and dmxConfigStoreXInput().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html b/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html index ca55fcce3..8d5fc6703 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html +++ b/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html @@ -6,16 +6,66 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXConfigListStruct Struct Reference

- + + +
+

DMXConfigListStruct Struct Reference

+ + +

Data Fields

const char * name
struct DMXConfigListStruct * next
-

Detailed Description

-Stores lists of configuration information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores lists of configuration information.

+

Field Documentation

+ +
+
+ + + + +
const char* DMXConfigListStruct::name
+
+
+ +

Referenced by dmxConfigConfigInputs(), dmxConfigFromCommandLine(), dmxConfigStoreDisplay(), dmxConfigStoreInput(), and dmxConfigStoreXInput().

+ +
+
+ +
+
+ + + + +
struct DMXConfigListStruct* DMXConfigListStruct::next [read]
+
+
+ +

Referenced by dmxConfigConfigInputs(), dmxConfigFromCommandLine(), dmxConfigStoreDisplay(), dmxConfigStoreInput(), and dmxConfigStoreXInput().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html deleted file mode 100644 index ed10c039b..000000000 --- a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXDesktopAttributes Struct Reference

#include <dmxext.h> -

- - -
-

Detailed Description

-Client-library desktop information structure, returned by DMXGetDesktopAttributes. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html index ea37ca26d..fc522c688 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html +++ b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXDesktopAttributesRec Struct Reference

#include <dmxextension.h> -

- - + + +
+

DMXDesktopAttributesRec Struct Reference

+

#include <dmxextension.h>

+
+ + + + +

Data Fields

int width
int height
int shiftX
int shiftY
-

Detailed Description

-Desktop attributes. Used by #ProcDMXGetDesktopAttributes and #ProcDMXChangeDesktopAttributes. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Desktop attributes. Used by ProcDMXGetDesktopAttributes and ProcDMXChangeDesktopAttributes.

+

Field Documentation

+ +
+
+ + + + +
int DMXDesktopAttributesRec::height
+
+
+ +

Referenced by dmxGetDesktopAttributes(), dmxSetDesktopAttribute(), and ProcDMXGetDesktopAttributes().

+ +
+
+ +
+
+ + + + +
int DMXDesktopAttributesRec::shiftX
+
+
+ +

Referenced by dmxGetDesktopAttributes(), dmxSetDesktopAttribute(), and ProcDMXGetDesktopAttributes().

+ +
+
+ +
+
+ + + + +
int DMXDesktopAttributesRec::shiftY
+
+
+ +

Referenced by dmxGetDesktopAttributes(), dmxSetDesktopAttribute(), and ProcDMXGetDesktopAttributes().

+ +
+
+ +
+
+ + + + +
int DMXDesktopAttributesRec::width
+
+
+ +

Referenced by dmxGetDesktopAttributes(), dmxSetDesktopAttribute(), and ProcDMXGetDesktopAttributes().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html deleted file mode 100644 index 6573b9efc..000000000 --- a/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXInputAttributes Struct Reference

#include <dmxext.h> -

- - -
-

Detailed Description

-Client-library input information structure, returned by DMXGetInputAttributes. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html index 9e5ee05cf..8bfe84b1d 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html +++ b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html @@ -6,18 +6,148 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXInputAttributesRec Struct Reference

#include <dmxextension.h> -

- - + + +
+

DMXInputAttributesRec Struct Reference

+

#include <dmxextension.h>

+
+ + + + + + + +

Data Fields

const char * name
int inputType
int physicalScreen
int physicalId
int isCore
int sendsCore
int detached
-

Detailed Description

-Input attributes. Used by #ProcDMXGetInputAttributes. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Input attributes. Used by ProcDMXGetInputAttributes.

+

Field Documentation

+ +
+
+ + + + +
int DMXInputAttributesRec::detached
+
+
+ +

Referenced by dmxGetInputAttributes(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
int DMXInputAttributesRec::inputType
+
+
+ +

Referenced by dmxAddInput(), dmxGetInputAttributes(), dmxSetInputAttribute(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
int DMXInputAttributesRec::isCore
+
+
+ +

Referenced by dmxGetInputAttributes(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
const char* DMXInputAttributesRec::name
+
+
+ +

Referenced by dmxAddInput(), dmxGetInputAttributes(), ProcDMXAddInput(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
int DMXInputAttributesRec::physicalId
+
+
+ +

Referenced by dmxGetInputAttributes(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
int DMXInputAttributesRec::physicalScreen
+
+
+ +

Referenced by dmxAddInput(), dmxGetInputAttributes(), dmxSetInputAttribute(), and ProcDMXGetInputAttributes().

+ +
+
+ +
+
+ + + + +
int DMXInputAttributesRec::sendsCore
+
+
+ +

Referenced by dmxAddInput(), dmxGetInputAttributes(), dmxSetInputAttribute(), and ProcDMXGetInputAttributes().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html deleted file mode 100644 index 708d4c3cf..000000000 --- a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXScreenAttributes Struct Reference

#include <dmxext.h> -

- - -
-

Detailed Description

-Client-library screen information structure, returned by DMXGetScreenAttributes. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html index 595b4aee6..ee2faa6ee 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html +++ b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html @@ -6,18 +6,228 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXScreenAttributesRec Struct Reference

#include <dmxextension.h> -

- - + + +
+

DMXScreenAttributesRec Struct Reference

+

#include <dmxextension.h>

+
+ + + + + + + + + + + + +

Data Fields

const char * displayName
int logicalScreen
unsigned int screenWindowWidth
unsigned int screenWindowHeight
int screenWindowXoffset
int screenWindowYoffset
unsigned int rootWindowWidth
unsigned int rootWindowHeight
int rootWindowXoffset
int rootWindowYoffset
int rootWindowXorigin
int rootWindowYorigin
-

Detailed Description

-Screen attributes. Used by #ProcDMXGetScreenAttributes and #ProcDMXChangeScreenAttributes. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Screen attributes. Used by ProcDMXGetScreenAttributes and ProcDMXChangeScreensAttributes.

+

Field Documentation

+ +
+
+ + + + +
const char* DMXScreenAttributesRec::displayName
+
+
+ +

Referenced by dmxAttachScreen(), dmxGetScreenAttributes(), ProcDMXAddScreen(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::logicalScreen
+
+
+ +

Referenced by dmxGetScreenAttributes(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
unsigned int DMXScreenAttributesRec::rootWindowHeight
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
unsigned int DMXScreenAttributesRec::rootWindowWidth
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::rootWindowXoffset
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::rootWindowXorigin
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::rootWindowYoffset
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::rootWindowYorigin
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
unsigned int DMXScreenAttributesRec::screenWindowHeight
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
unsigned int DMXScreenAttributesRec::screenWindowWidth
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::screenWindowXoffset
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+ +
+
+ + + + +
int DMXScreenAttributesRec::screenWindowYoffset
+
+
+ +

Referenced by dmxGetScreenAttributes(), dmxSetScreenAttribute(), and ProcDMXGetScreenAttributes().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html deleted file mode 100644 index 18c427819..000000000 --- a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXWindowAttributes Struct Reference

#include <dmxext.h> -

- - -
-

Detailed Description

-Client-library window information structure, returned by DMXGetWindowAttributes. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html index a18b883e6..c35cfff52 100644 --- a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html +++ b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

DMXWindowAttributesRec Struct Reference

#include <dmxextension.h> -

- - + + +
+

DMXWindowAttributesRec Struct Reference

+

#include <dmxextension.h>

+
+ + + + +

Data Fields

int screen
Window window
xRectangle pos
xRectangle vis
-

Detailed Description

-Window attributes. Used by #ProcDMXGetWidowAttributes. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Window attributes. Used by ProcDMXGetWindowAttributes.

+

Field Documentation

+ +
+
+ + + + +
xRectangle DMXWindowAttributesRec::pos
+
+
+ +

Referenced by dmxGetWindowAttributes(), and dmxPopulate().

+ +
+
+ +
+
+ + + + +
int DMXWindowAttributesRec::screen
+
+
+ +

Referenced by dmxGetWindowAttributes(), and dmxPopulate().

+ +
+
+ +
+
+ + + + +
xRectangle DMXWindowAttributesRec::vis
+
+
+ +

Referenced by dmxGetWindowAttributes(), and dmxPopulate().

+ +
+
+ +
+
+ + + + +
Window DMXWindowAttributesRec::window
+
+
+ +

Referenced by dmxGetWindowAttributes(), and dmxPopulate().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html index be011e397..ed84f96bb 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html @@ -6,18 +6,84 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigComment Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigComment Struct Reference

+

#include <dmxparse.h>

+
+ + + +

Data Fields

int token
int line
const char * comment
-

Detailed Description

-Stores parsed comments not stored with a token. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed comments not stored with a token.

+

Field Documentation

+ +
+
+ + + + +
const char* _DMXConfigComment::comment
+
+
+ +

Referenced by dmxConfigCreateComment(), dmxConfigFreeComment(), and dmxConfigPrintComment().

+ +
+
+ +
+
+ + + + +
int _DMXConfigComment::line
+
+
+ +

Referenced by dmxConfigCreateComment().

+ +
+
+ +
+
+ + + + +
int _DMXConfigComment::token
+
+
+ +

Referenced by dmxConfigCreateComment().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html index 53310fb7a..ff068c2fd 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html @@ -6,18 +6,356 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigDisplay Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigDisplay Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + + + + + + + + + + + + + + +

Data Fields

const char * name
int scrnWidth
int scrnHeight
int scrnX
int scrnY
int scrnXSign
int scrnYSign
int rootWidth
int rootHeight
int rootX
int rootY
int rootXSign
int rootYSign
int rootXOrigin
int rootYOrigin
DMXConfigTokenPtr start
DMXConfigStringPtr dname
DMXConfigFullDimPtr dim
DMXConfigPairPtr origin
DMXConfigTokenPtr end
-

Detailed Description

-Stores parsed display information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed display information.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigFullDimPtr _DMXConfigDisplay::dim
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigFreeDisplay(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
DMXConfigStringPtr _DMXConfigDisplay::dname
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigFreeDisplay(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigDisplay::end
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigFreeDisplay(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
const char* _DMXConfigDisplay::name
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyFromDisplay(), dmxConfigCopystrings(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigDisplay::origin
+
+
+ +

Referenced by dmxConfigCreateDisplay(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootHeight
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootWidth
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootX
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootXOrigin
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), dmxConfigFindDisplay(), dmxConfigGetDims(), dmxConfigMove(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootXSign
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootY
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootYOrigin
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), dmxConfigFindDisplay(), dmxConfigGetDims(), dmxConfigMove(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::rootYSign
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigDataUpdate(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnHeight
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), dmxConfigFindDisplay(), dmxConfigGetDims(), dmxConfigNDCallback(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnWidth
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), dmxConfigFindDisplay(), dmxConfigGetDims(), dmxConfigNDCallback(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnX
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDOkCallback(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnXSign
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), and dmxConfigEDOkCallback().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnY
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), dmxConfigEDOkCallback(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
int _DMXConfigDisplay::scrnYSign
+
+
+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCreateDisplay(), dmxConfigDataUpdate(), dmxConfigEDCallback(), and dmxConfigEDOkCallback().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigDisplay::start
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigFreeDisplay(), and dmxConfigPrintDisplay().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html index 644098698..fa6fe120e 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigEntry Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigEntry Struct Reference

+

#include <dmxparse.h>

+
+ + + + +

Data Fields

DMXConfigType type
DMXConfigCommentPtr comment
DMXConfigVirtualPtr virtual
struct _DMXConfigEntry * next
-

Detailed Description

-Heads entry storage. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Heads entry storage.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigCommentPtr _DMXConfigEntry::comment
+
+
+ +

Referenced by dmxConfigCreateEntry(), dmxConfigFreeEntry(), and dmxConfigPrint().

+ +
+
+ +
+
+ + + + +
struct _DMXConfigEntry* _DMXConfigEntry::next [read]
+
+
+ +

Referenced by dmxConfigAddEntry(), dmxConfigCopystrings(), dmxConfigDCCallback(), dmxConfigFreeEntry(), dmxConfigFromConfigFile(), dmxConfigGetDims(), dmxConfigPrint(), dmxConfigReadFile(), and dmxConfigSetupCnamemenu().

+ +
+
+ +
+
+ + + + +
DMXConfigType _DMXConfigEntry::type
+
+
+ +

Referenced by dmxConfigCopystrings(), dmxConfigCreateEntry(), dmxConfigDCCallback(), dmxConfigFreeEntry(), dmxConfigFromConfigFile(), dmxConfigGetDims(), dmxConfigPrint(), dmxConfigReadFile(), and dmxConfigSetupCnamemenu().

+ +
+
+ +
+
+ + + + +
DMXConfigVirtualPtr _DMXConfigEntry::virtual
+
+
+ +

Referenced by dmxConfigCopystrings(), dmxConfigCreateEntry(), dmxConfigDCCallback(), dmxConfigFreeEntry(), dmxConfigFromConfigFile(), dmxConfigGetDims(), dmxConfigMatch(), dmxConfigPrint(), dmxConfigReadFile(), and dmxConfigSetupCnamemenu().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html index 2e564ce87..86b195a03 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html @@ -6,18 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigFullDim Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigFullDim Struct Reference

+

#include <dmxparse.h>

+
+ + +

Data Fields

DMXConfigPartDimPtr scrn
DMXConfigPartDimPtr root
-

Detailed Description

-Stores a pair of geometry specifications. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores a pair of geometry specifications.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigPartDimPtr _DMXConfigFullDim::root
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreateFullDim(), dmxConfigFreeFullDim(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
DMXConfigPartDimPtr _DMXConfigFullDim::scrn
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreateFullDim(), dmxConfigFreeFullDim(), and dmxConfigPrintDisplay().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html index f60e11c63..9698660b2 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigNumber Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigNumber Struct Reference

+

#include <dmxparse.h>

+
+ + + + +

Data Fields

int token
int line
const char * comment
int number
-

Detailed Description

-Stores parsed numbers. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed numbers.

+

Field Documentation

+ +
+
+ + + + +
const char* _DMXConfigNumber::comment
+
+
+ +

Referenced by dmxConfigCreateNumber(), and dmxConfigFreeNumber().

+ +
+
+ +
+
+ + + + +
int _DMXConfigNumber::line
+
+
+ +

Referenced by dmxConfigCreateNumber().

+ +
+
+ +
+
+ + + + +
int _DMXConfigNumber::number
+
+
+ +

Referenced by dmxConfigCreateNumber().

+ +
+
+ +
+
+ + + + +
int _DMXConfigNumber::token
+
+
+ +

Referenced by dmxConfigCreateNumber().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html index 1ae073674..343bf018c 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigOption Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigOption Struct Reference

+

#include <dmxparse.h>

+
+ + + + +

Data Fields

char * string
DMXConfigTokenPtr start
DMXConfigStringPtr option
DMXConfigTokenPtr end
-

Detailed Description

-Stores parsed option information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed option information.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigOption::end
+
+
+ +

Referenced by dmxConfigCreateOption(), dmxConfigFreeOption(), and dmxConfigPrintOption().

+ +
+
+ +
+
+ + + + +
DMXConfigStringPtr _DMXConfigOption::option
+
+
+ +

Referenced by dmxConfigCopyFromOption(), dmxConfigCreateOption(), and dmxConfigFreeOption().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigOption::start
+
+
+ +

Referenced by dmxConfigCreateOption(), dmxConfigFreeOption(), and dmxConfigPrintOption().

+ +
+
+ +
+
+ + + + +
char* _DMXConfigOption::string
+
+
+ +

Referenced by dmxConfigCopyFromOption(), dmxConfigCreateOption(), dmxConfigFreeOption(), and dmxConfigPrintOption().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html index bd0454be6..a50556e73 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html @@ -6,18 +6,148 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigPair Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigPair Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + +

Data Fields

int token
int line
const char * comment
int x
int y
int xsign
int ysign
-

Detailed Description

-Stores parsed pairs (e.g., x y) -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed pairs (e.g., x y)

+

Field Documentation

+ +
+
+ + + + +
const char* _DMXConfigPair::comment
+
+
+ +

Referenced by dmxConfigCreatePair(), dmxConfigFreePair(), and dmxConfigPrintPair().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::line
+
+
+ +

Referenced by dmxConfigCreatePair().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::token
+
+
+ +

Referenced by dmxConfigCreatePair(), and dmxConfigPrintPair().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::x
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateDisplay(), dmxConfigCreatePair(), dmxConfigCreateVirtual(), dmxConfigCreateWall(), dmxConfigPrintDisplay(), dmxConfigPrintPair(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::xsign
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreatePair(), dmxConfigPrintDisplay(), and dmxConfigPrintPair().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::y
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateDisplay(), dmxConfigCreatePair(), dmxConfigCreateVirtual(), dmxConfigCreateWall(), dmxConfigPrintDisplay(), dmxConfigPrintPair(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
int _DMXConfigPair::ysign
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreatePair(), dmxConfigPrintDisplay(), and dmxConfigPrintPair().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html index 90f017e20..9d855aae8 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html @@ -6,18 +6,164 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigParam Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigParam Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + + +

Data Fields

int argc
const char ** argv
DMXConfigTokenPtr start
DMXConfigTokenPtr open
DMXConfigStringPtr param
DMXConfigTokenPtr close
DMXConfigTokenPtr end
struct _DMXConfigParam * next
-

Detailed Description

-Stores parsed param information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed param information.

+

Field Documentation

+ +
+
+ + + + +
int _DMXConfigParam::argc
+
+
+ +

Referenced by dmxConfigCreateParam(), and dmxConfigLookupParam().

+ +
+
+ +
+
+ + + + +
const char** _DMXConfigParam::argv
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigLookupParam().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigParam::close
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigParam::end
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + +
struct _DMXConfigParam* _DMXConfigParam::next [read]
+
+
+ +

Referenced by dmxConfigFreeParam(), dmxConfigLookupParam(), and dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigParam::open
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + +
DMXConfigStringPtr _DMXConfigParam::param
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigPrintParam().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigParam::start
+
+
+ +

Referenced by dmxConfigCreateParam(), dmxConfigFreeParam(), and dmxConfigPrintParam().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html index 07f4c7757..ca1d9a3ec 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html @@ -6,18 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigPartDim Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigPartDim Struct Reference

+

#include <dmxparse.h>

+
+ + +

Data Fields

DMXConfigPairPtr dim
DMXConfigPairPtr offset
-

Detailed Description

-Stores a geometry specification. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores a geometry specification.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigPartDim::dim
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreatePartDim(), dmxConfigFreePartDim(), and dmxConfigPrintDisplay().

+ +
+
+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigPartDim::offset
+
+
+ +

Referenced by dmxConfigCreateDisplay(), dmxConfigCreatePartDim(), dmxConfigFreePartDim(), and dmxConfigPrintDisplay().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html index a70f1a51a..93f1980f9 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html @@ -6,18 +6,116 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigString Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigString Struct Reference

+

#include <dmxparse.h>

+
+ + + + + +

Data Fields

int token
int line
const char * comment
const char * string
struct _DMXConfigString * next
-

Detailed Description

-Stores parsed strings. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed strings.

+

Field Documentation

+ +
+
+ + + + +
const char* _DMXConfigString::comment
+
+
+ +

Referenced by dmxConfigCreateString(), dmxConfigFreeString(), and dmxConfigPrintString().

+ +
+
+ +
+
+ + + + +
int _DMXConfigString::line
+
+
+ +

Referenced by dmxConfigCreateString().

+ +
+
+ +
+
+ + + + +
struct _DMXConfigString* _DMXConfigString::next [read]
+
+
+ +

Referenced by dmxConfigCopyFromOption(), dmxConfigCopyFromWall(), dmxConfigCreateOption(), dmxConfigCreateParam(), dmxConfigFreeString(), and dmxConfigPrintString().

+ +
+
+ +
+
+ + + + +
const char* _DMXConfigString::string
+
+
+ +

Referenced by dmxConfigCopyFromOption(), dmxConfigCopyFromWall(), dmxConfigCreateDisplay(), dmxConfigCreateOption(), dmxConfigCreateParam(), dmxConfigCreateString(), dmxConfigCreateVirtual(), dmxConfigFreeString(), dmxConfigPrintDisplay(), dmxConfigPrintOption(), dmxConfigPrintString(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
int _DMXConfigString::token
+
+
+ +

Referenced by dmxConfigCreateString().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html index a27630540..b2b903eab 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html @@ -6,18 +6,148 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigSub Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigSub Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + +

Data Fields

DMXConfigType type
DMXConfigCommentPtr comment
DMXConfigDisplayPtr display
DMXConfigWallPtr wall
DMXConfigOptionPtr option
DMXConfigParamPtr param
struct _DMXConfigSub * next
-

Detailed Description

-Stores options under an entry (subentry). -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores options under an entry (subentry).

+

Field Documentation

+ +
+
+ + + + +
DMXConfigCommentPtr _DMXConfigSub::comment
+
+
+ +

Referenced by dmxConfigCreateSub(), dmxConfigFreeSub(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
DMXConfigDisplayPtr _DMXConfigSub::display
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyData(), dmxConfigCopystrings(), dmxConfigCreateSub(), dmxConfigDDCallback(), dmxConfigFindDisplay(), dmxConfigFreeSub(), dmxConfigGetDims(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
struct _DMXConfigSub* _DMXConfigSub::next [read]
+
+
+ +

Referenced by dmxConfigAddSub(), dmxConfigCanvasUpdate(), dmxConfigCopyData(), dmxConfigCopystrings(), dmxConfigDDCallback(), dmxConfigFindDisplay(), dmxConfigFreeSub(), dmxConfigGetDims(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
DMXConfigOptionPtr _DMXConfigSub::option
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateSub(), dmxConfigFreeSub(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
DMXConfigParamPtr _DMXConfigSub::param
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateSub(), dmxConfigFreeSub(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
DMXConfigType _DMXConfigSub::type
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyData(), dmxConfigCopystrings(), dmxConfigCreateSub(), dmxConfigDDCallback(), dmxConfigFindDisplay(), dmxConfigFreeSub(), dmxConfigGetDims(), and dmxConfigPrintSub().

+ +
+
+ +
+
+ + + + +
DMXConfigWallPtr _DMXConfigSub::wall
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateSub(), dmxConfigFreeSub(), and dmxConfigPrintSub().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html index a7705deb9..c321bf658 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html @@ -6,18 +6,84 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigToken Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigToken Struct Reference

+

#include <dmxparse.h>

+
+ + + +

Data Fields

int token
int line
const char * comment
-

Detailed Description

-Stores tokens not stored in other structures (e.g., keywords and ;) -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores tokens not stored in other structures (e.g., keywords and ;)

+

Field Documentation

+ +
+
+ + + + +
const char* _DMXConfigToken::comment
+
+
+ +

Referenced by dmxConfigCreateToken(), dmxConfigFreeToken(), and dmxConfigPrintTokenFlag().

+ +
+
+ +
+
+ + + + +
int _DMXConfigToken::line
+
+
+ +

Referenced by dmxConfigCreateToken(), and dmxConfigPrintTokenFlag().

+ +
+
+ +
+
+ + + + +
int _DMXConfigToken::token
+
+
+ +

Referenced by dmxConfigCreateToken(), and dmxConfigPrintTokenFlag().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html index d221fa816..7f613920b 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html @@ -6,18 +6,180 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigVirtual Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigVirtual Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + + + +

Data Fields

const char * name
int width
int height
DMXConfigTokenPtr start
DMXConfigStringPtr vname
DMXConfigPairPtr dim
DMXConfigTokenPtr open
DMXConfigSubPtr subentry
DMXConfigTokenPtr close
-

Detailed Description

-Stores parsed virtual information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed virtual information.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigVirtual::close
+
+
+ +

Referenced by dmxConfigCreateVirtual(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigVirtual::dim
+
+
+ +

Referenced by dmxConfigCopyData(), dmxConfigCreateVirtual(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
int _DMXConfigVirtual::height
+
+
+ +

Referenced by dmxConfigCreateVirtual(), dmxConfigECCallback(), dmxConfigECOkCallback(), dmxConfigGetDims(), dmxConfigNCCallback(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
const char* _DMXConfigVirtual::name
+
+
+ +

Referenced by dmxConfigCopystrings(), dmxConfigCreateVirtual(), dmxConfigDataUpdate(), dmxConfigECCallback(), dmxConfigECOkCallback(), dmxConfigMatch(), dmxConfigPrintVirtual(), and dmxConfigSetupCnamemenu().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigVirtual::open
+
+
+ +

Referenced by dmxConfigCreateVirtual(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigVirtual::start
+
+
+ +

Referenced by dmxConfigCreateVirtual(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
DMXConfigSubPtr _DMXConfigVirtual::subentry
+
+
+ +

Referenced by dmxConfigCanvasUpdate(), dmxConfigCopyData(), dmxConfigCopystrings(), dmxConfigCreateVirtual(), dmxConfigDDCallback(), dmxConfigFindDisplay(), dmxConfigGetDims(), dmxConfigNDCallback(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
DMXConfigStringPtr _DMXConfigVirtual::vname
+
+
+ +

Referenced by dmxConfigCreateVirtual(), and dmxConfigPrintVirtual().

+ +
+
+ +
+
+ + + + +
int _DMXConfigVirtual::width
+
+
+ +

Referenced by dmxConfigCreateVirtual(), dmxConfigECCallback(), dmxConfigECOkCallback(), dmxConfigGetDims(), dmxConfigNCCallback(), and dmxConfigPrintVirtual().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html index fcb27db04..2716c5cbb 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html @@ -6,18 +6,180 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXConfigWall Struct Reference

#include <dmxparse.h> -

- - + + +
+

_DMXConfigWall Struct Reference

+

#include <dmxparse.h>

+
+ + + + + + + + + +

Data Fields

int width
int height
int xwall
int ywall
DMXConfigTokenPtr start
DMXConfigPairPtr wallDim
DMXConfigPairPtr displayDim
DMXConfigStringPtr nameList
DMXConfigTokenPtr end
-

Detailed Description

-Stores parsed wall information. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Stores parsed wall information.

+

Field Documentation

+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigWall::displayDim
+
+
+ +

Referenced by dmxConfigCreateWall(), dmxConfigFreeWall(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigWall::end
+
+
+ +

Referenced by dmxConfigCreateWall(), dmxConfigFreeWall(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + +
int _DMXConfigWall::height
+
+
+ +

Referenced by dmxConfigCopyFromWall(), and dmxConfigCreateWall().

+ +
+
+ +
+
+ + + + +
DMXConfigStringPtr _DMXConfigWall::nameList
+
+
+ +

Referenced by dmxConfigCopyFromWall(), dmxConfigCreateWall(), dmxConfigFreeWall(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + +
DMXConfigTokenPtr _DMXConfigWall::start
+
+
+ +

Referenced by dmxConfigCreateWall(), dmxConfigFreeWall(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + +
DMXConfigPairPtr _DMXConfigWall::wallDim
+
+
+ +

Referenced by dmxConfigCreateWall(), dmxConfigFreeWall(), and dmxConfigPrintWall().

+ +
+
+ +
+
+ + + + +
int _DMXConfigWall::width
+
+
+ +

Referenced by dmxConfigCopyFromWall(), and dmxConfigCreateWall().

+ +
+
+ +
+
+ + + + +
int _DMXConfigWall::xwall
+
+
+ +

Referenced by dmxConfigCopyFromWall(), and dmxConfigCreateWall().

+ +
+
+ +
+
+ + + + +
int _DMXConfigWall::ywall
+
+
+ +

Referenced by dmxConfigCopyFromWall(), and dmxConfigCreateWall().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html b/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html index 41ae5b368..ea95b9c0b 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html @@ -6,68 +6,70 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXEventMap Struct Reference

#include <dmxinputinit.h> -

- - - - - - - + + +
+

_DMXEventMap Struct Reference

+

#include <dmxinputinit.h>

+

Data Fields

int remote
int server
+ + +

Data Fields

int remote
int server
-

Detailed Description

-Stores a mapping between the device id on the remote X server and the id on the DMX server -

-

Field Documentation

-

- - - - -
- +

Detailed Description

+

Stores a mapping between the device id on the remote X server and the id on the DMX server

+

Field Documentation

+ +
+
+
- +
int _DMXEventMap::remote + int _DMXEventMap::remote
-
- - - - - -
-   - + +
+

Event number on remote X server

-

-Event number on remote X server

-

- - - - -
- +

Referenced by dmxMapClear(), dmxMapInsert(), and dmxMapLookup().

+ + + + +
+
+
- +
int _DMXEventMap::server + int _DMXEventMap::server
-
- - - - - -
-   - + +
+

Event number (unbiased) on DMX server

-

-Event number (unbiased) on DMX server

-

The documentation for this struct was generated from the following file: +

Referenced by dmxMapInsert(), and dmxMapLookup().

+ + + +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html index a89e01f5b..3ee6c6b58 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html @@ -6,476 +6,391 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXInputInfo Struct Reference

#include <dmxinput.h> -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Fields

const char * name
Bool freename
Bool detached
int inputIdx
int scrnIdx
Bool core
Bool console
Bool windows
dmxSigioState sigioState
int sigioFdCount
int sigioFd [DMX_MAX_SIGIO_FDS]
Bool sigioAdded [DMX_MAX_SIGIO_FDS]
int vt_switch_pending
int vt_switched
int numDevs
DMXLocalInputInfoPtr * devs
char * keycodes
char * symbols
char * geometry
-

Detailed Description

-DMXInputInfo is typedef'd in #dmx.h so that all routines can have access to the global pointers. However, the elements are only available to input-related routines. -

-

Field Documentation

-

- - - - -
- + + +
+

_DMXInputInfo Struct Reference

+

#include <dmxinput.h>

+
+ + + + + + + + + + + + + + + + + + + + + + +

Data Fields

const char * name
Bool freename
Bool detached
int inputIdx
int scrnIdx
Bool core
Bool console
Bool windows
ProcessInputEventsProc processInputEvents
UpdateWindowInfoProc updateWindowInfo
dmxSigioState sigioState
int sigioFdCount
int sigioFd [DMX_MAX_SIGIO_FDS]
Bool sigioAdded [DMX_MAX_SIGIO_FDS]
int vt_switch_pending
int vt_switched
int numDevs
DMXLocalInputInfoPtr * devs
char * keycodes
char * symbols
char * geometry
+

Detailed Description

+

DMXInputInfo is typedef'd in dmx.h so that all routines can have access to the global pointers. However, the elements are only available to input-related routines.

+

Field Documentation

+ +
+
+ - +
Bool _DMXInputInfo::console + Bool _DMXInputInfo::console
-
- - - - - -
-   - - -

-True if console and backend input share the same backend display

-

- - - - -
- + +
+

True if console and backend input share the same backend display

+ +

Referenced by dmxCloseConsole(), and dmxInputInit().

+ +
+ + +
+
+
- +
Bool _DMXInputInfo::core + Bool _DMXInputInfo::core
-
- - - - - -
-   - - -

-If True, initialize these devices as devices that send core events

-

- - - - -
- + +
+

If True, initialize these devices as devices that send core events

+ +

Referenced by dmxConfigAddInput(), dmxInputCopyLocal(), and dmxInputInit().

+ +
+ + +
+
+
- +
Bool _DMXInputInfo::detached + Bool _DMXInputInfo::detached
-
- - - - - -
-   - - -

-If true, input screen is detached

-

- - - - -
- + +
+

If true, input screen is detached

+ +

Referenced by dmxAdjustCursorBoundaries(), dmxChangePointerControl(), dmxCollectAll(), dmxCoreMotion(), dmxGetInputAttributes(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputAttachOld(), dmxInputDetach(), dmxInputInit(), dmxInputLogDevices(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxProcessInputEvents(), dmxUpdateWindowInfo(), dmxUpdateWindowInformation(), and ProcessInputEvents().

+ +
+ + +
+
+
- +
DMXLocalInputInfoPtr* _DMXInputInfo::devs + DMXLocalInputInfoPtr* _DMXInputInfo::devs
-
- - - - - -
-   - - -

-List of actual input devices. Each _DMXInputInfo structure can refer to more than one device. For example, the keyboard and the pointer of a backend display; or all of the XInput extension devices on a backend display.

-

- - - - -
- + +
+

List of actual input devices. Each _DMXInputInfo structure can refer to more than one device. For example, the keyboard and the pointer of a backend display; or all of the XInput extension devices on a backend display.

+ +

Referenced by dmxApplyFunctions(), dmxChangePointerControl(), dmxCollectAll(), dmxCommonCopyPrivate(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputCopyLocal(), dmxInputDetach(), dmxInputFree(), dmxInputInit(), dmxInputLateReInit(), dmxInputLocateId(), dmxInputLogDevices(), dmxInputReInit(), dmxInputScanForExtensions(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxProcessInputEvents(), dmxSigioHandler(), dmxSwitchReturn(), dmxTranslateAndEnqueueExtEvent(), dmxUpdateWindowInformation(), and dmxWakeupHandler().

+ +
+ + +
+
+
- +
Bool _DMXInputInfo::freename + Bool _DMXInputInfo::freename
-
- - - - - -
-   - - -

-If true, free name on destroy

-

- - - - -
- + +
+

If true, free name on destroy

+ +

Referenced by dmxInputAttachConsole(), and dmxInputFree().

+ +
+ + +
+
+
- +
char* _DMXInputInfo::geometry + char* _DMXInputInfo::geometry
-
- - - - - -
-   - - -

-XKB geometry from command line

-

- - - - -
- + +
+

XKB geometry from command line

+ +

Referenced by dmxInputFree(), and dmxInputInit().

+ +
+ + +
+
+
- +
int _DMXInputInfo::inputIdx + int _DMXInputInfo::inputIdx
-
- - - - - -
-   - - -

-Index into dmxInputs global

-

- - - - -
- + +
+

Index into dmxInputs global

+ +

Referenced by dmxConfigAddInput(), dmxHeader(), dmxInputCopyLocal(), dmxInputInit(), and dmxInputLogDevices().

+ +
+ + +
+
+
- +
char* _DMXInputInfo::keycodes + char* _DMXInputInfo::keycodes
-
- - - - - -
-   - - -

-XKB keycodes from command line

-

- - - - -
- + +
+

XKB keycodes from command line

+ +

Referenced by dmxInputFree(), and dmxInputInit().

+ +
+ + +
+
+
- +
const char* _DMXInputInfo::name + const char* _DMXInputInfo::name
-
- - - - - -
-   - - -

-Name of input display or device (from command line or config file)

-

- - - - -
- + +
+

Name of input display or device (from command line or config file)

+ +

Referenced by dmxBackendInitPrivate(), dmxConfigAddInput(), dmxConsoleCapture(), dmxConsoleInit(), dmxDump(), dmxGetInputAttributes(), dmxHeader(), dmxInputAttachConsole(), dmxInputFree(), dmxInputInit(), dmxInputLogDevices(), and dmxInputScanForExtensions().

+ +
+ + +
+
+
- +
int _DMXInputInfo::numDevs + int _DMXInputInfo::numDevs
-
- - - - - -
-   - - -

-Number of devices handled in this _DMXInputInfo structure.

-

- - - - -
- + +
+

Number of devices handled in this _DMXInputInfo structure.

+ +

Referenced by dmxApplyFunctions(), dmxChangePointerControl(), dmxCollectAll(), dmxCommonCopyPrivate(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxCoreMotion(), dmxDump(), dmxGetInputAttributes(), dmxInputAttachOld(), dmxInputCopyLocal(), dmxInputDetach(), dmxInputFree(), dmxInputInit(), dmxInputLateReInit(), dmxInputLocateId(), dmxInputLogDevices(), dmxInputReInit(), dmxInputScanForExtensions(), dmxKeyboardBellProc(), dmxKeyboardKbdCtrlProc(), dmxProcessInputEvents(), dmxSigioHandler(), dmxSwitchReturn(), dmxTranslateAndEnqueueExtEvent(), dmxUpdateWindowInformation(), and dmxWakeupHandler().

+ +
+ + +
+
+
- +
int _DMXInputInfo::scrnIdx + ProcessInputEventsProc _DMXInputInfo::processInputEvents
-
- - - - - -
-   - - -

-Index into dmxScreens global

-

- - - - -
- + +
+ +

Referenced by dmxInputInit(), and ProcessInputEvents().

+ +
+ + +
+
+
- +
Bool _DMXInputInfo::sigioAdded[DMX_MAX_SIGIO_FDS] + int _DMXInputInfo::scrnIdx
-
- - - - - -
-   - - -

-Active fds

-

- - - - -
- + +
+

Index into dmxScreens global

+ +

Referenced by dmxConfigAddInput(), dmxGetInputAttributes(), dmxInputAttachBackend(), dmxInputAttachConsole(), dmxInputDetach(), dmxInputDetachAll(), and dmxInputInit().

+ +
+ + +
+
+
- +
int _DMXInputInfo::sigioFd[DMX_MAX_SIGIO_FDS] + Bool _DMXInputInfo::sigioAdded[DMX_MAX_SIGIO_FDS]
-
- - - - - -
-   - - -

-List of fds

-

- - - - -
- + +
+

Active fds

+ +

Referenced by dmxSigioAdd(), and dmxSigioRemove().

+ +
+ + +
+
+
- +
int _DMXInputInfo::sigioFdCount + int _DMXInputInfo::sigioFd[DMX_MAX_SIGIO_FDS]
-
- - - - - -
-   - - -

-Number of fds in use

-

- - - - -
- + +
+

List of fds

+ +

Referenced by dmxSigioAdd(), dmxSigioRegister(), and dmxSigioRemove().

+ +
+ + +
+
+
- +
dmxSigioState _DMXInputInfo::sigioState + int _DMXInputInfo::sigioFdCount
-
- - - - - -
-   - - -

-Current stat

-

- - - - -
- + +
+

Number of fds in use

+ +

Referenced by dmxSigioAdd(), dmxSigioRegister(), dmxSigioRemove(), and dmxSigioUnregister().

+ +
+ + +
+
+
- +
char* _DMXInputInfo::symbols + dmxSigioState _DMXInputInfo::sigioState
-
- - - - - -
-   - - -

-XKB symbols from command line

-

- - - - -
- + +
+

Current stat

+ +

Referenced by dmxSigioAdd(), dmxSigioHandler(), dmxSigioRegister(), dmxSigioRemove(), and dmxSigioUnregister().

+ +
+ + +
+
+
- +
int _DMXInputInfo::vt_switch_pending + char* _DMXInputInfo::symbols
-
- - - - - -
-   - - -

-True if a VT switch is pending, but has not yet happened.

-

- - - - -
- + +
+

XKB symbols from command line

+ +

Referenced by dmxInputFree(), and dmxInputInit().

+ +
+ + +
+
+
- +
int _DMXInputInfo::vt_switched + UpdateWindowInfoProc _DMXInputInfo::updateWindowInfo
-
- - - - - -
-   - - -

-True if a VT switch has happened.

-

- - - - -
- + +
+ +

Referenced by dmxInputInit(), and dmxUpdateWindowInfo().

+ +
+ + +
+
+
- +
Bool _DMXInputInfo::windows + int _DMXInputInfo::vt_switch_pending
-
- - - - - -
-   - - -

-True if window outlines are draw in console

-

The documentation for this struct was generated from the following file: + +
+

True if a VT switch is pending, but has not yet happened.

+ +

Referenced by dmxWakeupHandler().

+ +
+ + +
+
+ + + + +
int _DMXInputInfo::vt_switched
+
+
+

True if a VT switch has happened.

+ +

Referenced by dmxSwitchReturn(), and dmxWakeupHandler().

+ +
+
+ +
+
+ + + + +
Bool _DMXInputInfo::windows
+
+
+

True if window outlines are draw in console

+ +

Referenced by dmxConsoleDraw(), and dmxInputInit().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html index 73b3e3ba6..9803358d9 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html @@ -6,764 +6,557 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXLocalInitInfo Struct Reference

#include <dmxinputinit.h> -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Fields

int keyboard
int keyClass
KeySymsRec keySyms
int freemap
CARD8 modMap [MAP_LENGTH]
XkbDescPtr xkb
XkbComponentNamesRec names
int freenames
int force
int buttonClass
int numButtons
unsigned char map [DMX_MAX_BUTTONS]
int valuatorClass
int numRelAxes
int numAbsAxes
int minval [DMX_MAX_AXES]
int maxval [DMX_MAX_AXES]
int res [DMX_MAX_AXES]
int minres [DMX_MAX_AXES]
int maxres [DMX_MAX_AXES]
int focusClass
int proximityClass
int kbdFeedbackClass
int ptrFeedbackClass
int ledFeedbackClass
int belFeedbackClass
int intFeedbackClass
int strFeedbackClass
int maxSymbols
int maxSymbolsSupported
KeySym * symbols
-

Detailed Description

-Stores information from low-level device that is used to initialize the device at the dix level. -

-

Field Documentation

-

- - - - -
- + + +
+

_DMXLocalInitInfo Struct Reference

+

#include <dmxinputinit.h>

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Fields

int keyboard
int keyClass
KeySymsRec keySyms
int freemap
CARD8 modMap [MAP_LENGTH]
XkbDescPtr xkb
XkbComponentNamesRec names
int freenames
int force
int buttonClass
int numButtons
unsigned char map [DMX_MAX_BUTTONS]
int valuatorClass
int numRelAxes
int numAbsAxes
int minval [DMX_MAX_AXES]
int maxval [DMX_MAX_AXES]
int res [DMX_MAX_AXES]
int minres [DMX_MAX_AXES]
int maxres [DMX_MAX_AXES]
int focusClass
int proximityClass
int kbdFeedbackClass
int ptrFeedbackClass
int ledFeedbackClass
int belFeedbackClass
int intFeedbackClass
int strFeedbackClass
int maxSymbols
int maxSymbolsSupported
KeySym * symbols
+

Detailed Description

+

Stores information from low-level device that is used to initialize the device at the dix level.

+

Field Documentation

+ +
+
+ - +
int _DMXLocalInitInfo::belFeedbackClass + int _DMXLocalInitInfo::belFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has a bell

-

- - - - -
- + +
+

Non-zero if device has a bell

+ +

Referenced by dmxDeviceOnOff(), and othUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::buttonClass + int _DMXLocalInitInfo::buttonClass
-
- - - - - -
-   - - -

-Non-zero if buttons are present

-

- - - - -
- + +
+

Non-zero if buttons are present

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::focusClass + int _DMXLocalInitInfo::focusClass
-
- - - - - -
-   - - -

-Non-zero if device can cause focus

-

- - - - -
- + +
+

Non-zero if device can cause focus

+ +

Referenced by dmxBackendKbdGetInfo(), dmxCommonOthGetInfo(), dmxConsoleKbdGetInfo(), dmxDeviceOnOff(), dmxDummyKbdGetInfo(), kbdLinuxGetInfo(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::force + int _DMXLocalInitInfo::force
-
- - - - - -
-   - - -

-Do not allow command line override

-

- - - - -
- + +
+

Do not allow command line override

+ +

Referenced by dmxDummyKbdGetInfo(), dmxKeyboardOn(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::freemap + int _DMXLocalInitInfo::freemap
-
- - - - - -
-   - - -

-If non-zero, free keySyms.map

-

- - - - -
- + +
+

If non-zero, free keySyms.map

+ +

Referenced by dmxBackendKbdGetInfo(), dmxConsoleKbdGetInfo(), dmxDeviceOnOff(), and dmxDummyKbdGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::freenames + int _DMXLocalInitInfo::freenames
-
- - - - - -
-   - - -

-Non-zero if names should be free'd

-

- - - - -
- + +
+

Non-zero if names should be free'd

+ +

Referenced by dmxCommonKbdGetInfo(), and dmxKeyboardOn().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::intFeedbackClass + int _DMXLocalInitInfo::intFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has integer feedback

-

- - - - -
- + +
+

Non-zero if device has integer feedback

+ +

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::kbdFeedbackClass + int _DMXLocalInitInfo::kbdFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has keyboard feedback

-

- - - - -
- + +
+

Non-zero if device has keyboard feedback

+ +

Referenced by dmxBackendKbdGetInfo(), dmxCommonOthGetInfo(), dmxConsoleKbdGetInfo(), dmxDummyKbdGetInfo(), kbdLinuxGetInfo(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::keyboard + int _DMXLocalInitInfo::keyboard
-
- - - - - -
-   - - -

-Non-zero if the device is a keyboard

-

- - - - -
- + +
+

Non-zero if the device is a keyboard

+ +

Referenced by dmxBackendKbdGetInfo(), dmxCommonOthGetInfo(), dmxConsoleKbdGetInfo(), dmxDeviceOnOff(), dmxDummyKbdGetInfo(), kbdLinuxGetInfo(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::keyClass + int _DMXLocalInitInfo::keyClass
-
- - - - - -
-   - - -

-Non-zero if keys are present

-

- - - - -
- + +
+

Non-zero if keys are present

+ +

Referenced by dmxBackendKbdGetInfo(), dmxCommonOthGetInfo(), dmxConsoleKbdGetInfo(), dmxDeviceOnOff(), dmxDummyKbdGetInfo(), kbdLinuxGetInfo(), kbdUSBGetInfo(), mouUSBGetInfo(), and othUSBGetInfo().

+ +
+ + +
+
+
- +
KeySymsRec _DMXLocalInitInfo::keySyms + KeySymsRec _DMXLocalInitInfo::keySyms
-
- - - - - -
-   - - -

-Key symbols

-

- - - - -
- + +
+

Key symbols

+ +

Referenced by dmxBackendKbdGetInfo(), dmxCommonOthGetInfo(), dmxConsoleKbdGetInfo(), dmxDeviceOnOff(), dmxDummyKbdGetInfo(), kbdLinuxGetInfo(), kbdUSBGetInfo(), mouUSBGetInfo(), and othUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::ledFeedbackClass + int _DMXLocalInitInfo::ledFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has LED indicators

-

- - - - -
- + +
+

Non-zero if device has LED indicators

+ +

Referenced by dmxDeviceOnOff(), and othUSBGetInfo().

+ +
+ + +
+
+
- +
unsigned char _DMXLocalInitInfo::map[DMX_MAX_BUTTONS] + unsigned char _DMXLocalInitInfo::map[DMX_MAX_BUTTONS]
-
- - - - - -
-   - - -

-Button map

-

- - - - -
- + +
+

Button map

+ +

Referenced by dmxBackendMouGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::maxres[DMX_MAX_AXES] + int _DMXLocalInitInfo::maxres[DMX_MAX_AXES]
-
- - - - - -
-   - - -

-Maximum resolutions

-

- - - - -
- + +
+

Maximum resolutions

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::maxSymbols + int _DMXLocalInitInfo::maxSymbols
-
- - - - - -
-   - - -

-Maximum symbols

-

- - - - -
- + +
+

Maximum symbols

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::maxSymbolsSupported + int _DMXLocalInitInfo::maxSymbolsSupported
-
- - - - - -
-   - - -

-Maximum symbols supported

-

- - - - -
- + +
+

Maximum symbols supported

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::maxval[DMX_MAX_AXES] + int _DMXLocalInitInfo::maxval[DMX_MAX_AXES]
-
- - - - - -
-   - - -

-Maximum values

-

- - - - -
- + +
+

Maximum values

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::minres[DMX_MAX_AXES] + int _DMXLocalInitInfo::minres[DMX_MAX_AXES]
-
- - - - - -
-   - - -

-Minimum resolutions

-

- - - - -
- + +
+

Minimum resolutions

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::minval[DMX_MAX_AXES] + int _DMXLocalInitInfo::minval[DMX_MAX_AXES]
-
- - - - - -
-   - - -

-Minimum values

-

- - - - -
- + +
+

Minimum values

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
CARD8 _DMXLocalInitInfo::modMap[MAP_LENGTH] + CARD8 _DMXLocalInitInfo::modMap[MAP_LENGTH]
-
- - - - - -
-   - - -

-Modifier map

-

- - - - -
- + +
+

Modifier map

+ +

Referenced by dmxBackendKbdGetInfo(), dmxConsoleKbdGetInfo(), kbdLinuxGetInfo(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
XkbComponentNamesRec _DMXLocalInitInfo::names + XkbComponentNamesRec _DMXLocalInitInfo::names
-
- - - - - -
-   - - -

-XKB component names

-

- - - - -
- + +
+

XKB component names

+ +

Referenced by dmxCommonKbdGetInfo(), dmxKeyboardOn(), and kbdUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::numAbsAxes + int _DMXLocalInitInfo::numAbsAxes
-
- - - - - -
-   - - -

-Number of absolute axes

-

- - - - -
- + +
+

Number of absolute axes

+ +

Referenced by dmxCommonOthGetInfo(), dmxDeviceOnOff(), and othUSBGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::numButtons + int _DMXLocalInitInfo::numButtons
-
- - - - - -
-   - - -

-Number of buttons

-

- - - - -
- + +
+

Number of buttons

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::numRelAxes + int _DMXLocalInitInfo::numRelAxes
-
- - - - - -
-   - - -

-Number of relative axes

-

- - - - -
- + +
+

Number of relative axes

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::proximityClass + int _DMXLocalInitInfo::proximityClass
-
- - - - - -
-   - - -

-Non-zero if device causes proximity events

-

- - - - -
- + +
+

Non-zero if device causes proximity events

+ +

Referenced by dmxCommonOthGetInfo(), and dmxDeviceOnOff().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::ptrFeedbackClass + int _DMXLocalInitInfo::ptrFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has pointer feedback

-

- - - - -
- + +
+

Non-zero if device has pointer feedback

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::res[DMX_MAX_AXES] + int _DMXLocalInitInfo::res[DMX_MAX_AXES]
-
- - - - - -
-   - - -

-Resolution

-

- - - - -
- + +
+

Resolution

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::strFeedbackClass + int _DMXLocalInitInfo::strFeedbackClass
-
- - - - - -
-   - - -

-Non-zero if device has string feedback

-

- - - - -
- + +
+

Non-zero if device has string feedback

+ +

Referenced by dmxDeviceOnOff().

+ +
+ + +
+
+
- +
KeySym* _DMXLocalInitInfo::symbols + KeySym* _DMXLocalInitInfo::symbols
-
- - - - - -
-   - - -

-Key symbols

-

- - - - -
- + +
+

Key symbols

+ +
+ + +
+
+
- +
int _DMXLocalInitInfo::valuatorClass + int _DMXLocalInitInfo::valuatorClass
-
- - - - - -
-   - - -

-Non-zero if valuators are present

-

- - - - -
- + +
+

Non-zero if valuators are present

+ +

Referenced by dmxBackendMouGetInfo(), dmxCommonOthGetInfo(), dmxConsoleMouGetInfo(), dmxDeviceOnOff(), dmxDummyMouGetInfo(), mouUSBGetInfo(), msLinuxGetInfo(), othUSBGetInfo(), and ps2LinuxGetInfo().

+ +
+ + +
+
+
- +
XkbDescPtr _DMXLocalInitInfo::xkb + XkbDescPtr _DMXLocalInitInfo::xkb
-
- - - - - -
-   - - -

-XKB description

-

The documentation for this struct was generated from the following file: + +
+

XKB description

+ +

Referenced by dmxDeviceOnOff().

+ +
+ +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html index 7893e905f..8a3ee7cc4 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html @@ -6,982 +6,755 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXLocalInputInfo Struct Reference

#include <dmxinputinit.h> -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Data Fields

const char * name
DMXLocalInputType type
DMXLocalInputExtType extType
int binding
dmxCreatePrivateProcPtr create_private
dmxDestroyPrivateProcPtr destroy_private
dmxInitProcPtr init
dmxReInitProcPtr reinit
dmxLateReInitProcPtr latereinit
dmxGetInfoProcPtr get_info
dmxOnProcPtr on
dmxOffProcPtr off
dmxUpdatePositionProcPtr update_position
dmxVTPreSwitchProcPtr vt_pre_switch
dmxVTPostSwitchProcPtr vt_post_switch
dmxVTSwitchProcPtr vt_switch
dmxCollectEventsProcPtr collect_events
dmxProcessInputProcPtr process_input
dmxUpdateInfoProcPtr update_info
dmxMCtrlProcPtr mCtrl
dmxKBCtrlProcPtr kCtrl
dmxKBBellProcPtr kBell
pointer private
int isCore
int sendsCore
KeybdCtrl kctrl
PtrCtrl mctrl
DeviceIntPtr pDevice
int inputIdx
int lastY
int head
int tail
unsigned long * history
int * valuators
int savedMotionEvents
int savedSendsCore
DMXEventMap map [DMX_MAP_ENTRIES]
int mapOptimize
long deviceId
const char * deviceName
-

Detailed Description

-This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c).
See also:
dmxinput.h

+ +

+
+

_DMXLocalInputInfo Struct Reference

+

#include <dmxinputinit.h>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Fields

const char * name
DMXLocalInputType type
DMXLocalInputExtType extType
int binding
dmxCreatePrivateProcPtr create_private
dmxDestroyPrivateProcPtr destroy_private
dmxInitProcPtr init
dmxReInitProcPtr reinit
dmxLateReInitProcPtr latereinit
dmxGetInfoProcPtr get_info
dmxOnProcPtr on
dmxOffProcPtr off
dmxUpdatePositionProcPtr update_position
dmxVTPreSwitchProcPtr vt_pre_switch
dmxVTPostSwitchProcPtr vt_post_switch
dmxVTSwitchProcPtr vt_switch
dmxCollectEventsProcPtr collect_events
dmxProcessInputProcPtr process_input
dmxFunctionsProcPtr functions
dmxUpdateInfoProcPtr update_info
dmxMCtrlProcPtr mCtrl
dmxKBCtrlProcPtr kCtrl
dmxKBBellProcPtr kBell
pointer private
int isCore
int sendsCore
KeybdCtrl kctrl
PtrCtrl mctrl
DeviceIntPtr pDevice
int inputIdx
int lastX
int lastY
int head
int tail
unsigned long * history
int * valuators
int(* savedMotionProc )(DeviceIntPtr, xTimecoord *, unsigned long, unsigned long, ScreenPtr)
int savedMotionEvents
int savedSendsCore
DMXEventMap map [DMX_MAP_ENTRIES]
int mapOptimize
long deviceId
const char * deviceName
+

Detailed Description

+

This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c).

+
See also:
dmxinput.h
+
dmxextensions.c
- -

-

Field Documentation

-

- - - - -
- - -
int _DMXLocalInputInfo::binding -
-
- - - - - -
-   - - -

-Count of how many consecutive structs are bound to the same device

-

- - - - -
- - -
dmxCollectEventsProcPtr _DMXLocalInputInfo::collect_events -
-
- - - - - -
-   - - -

-Collect and enqueue events from the device

-

- - - - -
- - -
dmxCreatePrivateProcPtr _DMXLocalInputInfo::create_private -
-
- - - - - -
-   - - -

-Create device-dependent private

-

- - - - -
- - -
dmxDestroyPrivateProcPtr _DMXLocalInputInfo::destroy_private -
-
- - - - - -
-   - - -

-Destroy device-dependent private

-

- - - - -
- - -
long _DMXLocalInputInfo::deviceId -
-
- - - - - -
-   - - -

-device id on remote side, if any

-

- - - - -
- - -
const char* _DMXLocalInputInfo::deviceName -
-
- - - - - -
-   - - -

-devive name on remote side, if any

-

- - - - -
- - -
DMXLocalInputExtType _DMXLocalInputInfo::extType -
-
- - - - - -
-   - - -

-Extended device type

-

- - - - -
- - -
dmxGetInfoProcPtr _DMXLocalInputInfo::get_info -
-
- - - - - -
-   - - -

-Get device information

-

- - - - -
- - -
int _DMXLocalInputInfo::head -
-
- - - - - -
-   - - -

-XInput motion history head

-

- - - - -
- - -
unsigned long* _DMXLocalInputInfo::history -
-
- - - - - -
-   - - -

-XInput motion history

-

- - - - -
- - -
dmxInitProcPtr _DMXLocalInputInfo::init -
-
- - - - - -
-   - - -

-Initialize device

-

- - - - -
- - -
int _DMXLocalInputInfo::inputIdx -
-
- - - - - -
-   - - -

-High-level index

-

- - - - -
- - -
int _DMXLocalInputInfo::isCore -
-
- - - - - -
-   - - -

-Is a DMX core device

-

- - - - -
- - -
dmxKBBellProcPtr _DMXLocalInputInfo::kBell -
-
- - - - - -
-   - - -

-Bell control

-

- - - - -
- - -
KeybdCtrl _DMXLocalInputInfo::kctrl -
-
- - - - - -
-   - - -

-Keyboard control

-

- - - - -
- +

Field Documentation

+ +
+
+
- +
dmxKBCtrlProcPtr _DMXLocalInputInfo::kCtrl + int _DMXLocalInputInfo::binding
-
- - - - - -
-   - - -

-Keyboard control

-

- - - - -
- + +
+

Count of how many consecutive structs are bound to the same device

+ +

Referenced by dmxApplyFunctions(), dmxCollectAll(), dmxCoreMotion(), dmxProcessInputEvents(), and dmxUpdateWindowInformation().

+ +
+ + +
+
+
- +
int _DMXLocalInputInfo::lastY + dmxCollectEventsProcPtr _DMXLocalInputInfo::collect_events
-
- - - - - -
-   - - -

-Last known position; for XInput in dmxevents.c

-

- - - - -
- + +
+

Collect and enqueue events from the device

+ +

Referenced by dmxCollectAll(), and dmxSigioHandler().

+ +
+ + +
+
+
- +
dmxLateReInitProcPtr _DMXLocalInputInfo::latereinit + dmxCreatePrivateProcPtr _DMXLocalInputInfo::create_private
-
- - - - - -
-   - - -

-Reinitialize a device (called very late during a reconfiguration)

-

- - - - -
- + +
+

Create device-dependent private

+ +

Referenced by dmxAddDevice().

+ +
+ + +
+
+
-
DMXEventMap _DMXLocalInputInfo::map[DMX_MAP_ENTRIES] -
-
- - - - - -
-   - - -

-XInput device id map

-

- - - - -
- + + +
dmxDestroyPrivateProcPtr _DMXLocalInputInfo::destroy_private
+ +
+

Destroy device-dependent private

+ +

Referenced by dmxInputFreeLocal().

+ +
+ + +
+
+ -
int _DMXLocalInputInfo::mapOptimize -
-
- - - - - -
-   - - -

-XInput device id map optimization

-

- - - - -
- + + +
long _DMXLocalInputInfo::deviceId
+ +
+

device id on remote side, if any

+ +

Referenced by dmxGetInputAttributes(), dmxInputCopyLocal(), dmxInputLogDevices(), dmxInputScanForExtensions(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+ + + + +
const char* _DMXLocalInputInfo::deviceName
+
+
+

devive name on remote side, if any

+ +

Referenced by dmxInputFreeLocal(), dmxInputLogDevices(), and dmxInputScanForExtensions().

+ +
+
+ +
+
+ + + + +
DMXLocalInputExtType _DMXLocalInputInfo::extType
+
+
+

Extended device type

+ +

Referenced by dmxConsoleCapture(), dmxConsoleUncapture(), and dmxGetInputAttributes().

+ +
+
+ +
+
+ + + + +
dmxFunctionsProcPtr _DMXLocalInputInfo::functions
+
+
+ +

Referenced by dmxApplyFunctions().

+ +
+
+ +
+
+ + + + +
dmxGetInfoProcPtr _DMXLocalInputInfo::get_info
+
+
+

Get device information

+ +
+
+ +
+
+ + + + +
int _DMXLocalInputInfo::head
+
+
+

XInput motion history head

+ +
+
+ +
+
+ + + + +
unsigned long* _DMXLocalInputInfo::history
+
+
+

XInput motion history

+ +

Referenced by dmxInputFreeLocal().

+ +
+
+ +
+
+ - + +
PtrCtrl _DMXLocalInputInfo::mctrl + dmxInitProcPtr _DMXLocalInputInfo::init
+
+
+

Initialize device

+ +
+
+ +
+
+ + + + +
int _DMXLocalInputInfo::inputIdx
+
+
+

High-level index

+ +

Referenced by dmxAddDevice(), dmxCheckFunctionKeys(), dmxInputCopyLocal(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
int _DMXLocalInputInfo::isCore
+
+
+

Is a DMX core device

+ +

Referenced by ChangeKeyboardDevice(), ChangePointerDevice(), dmxAddDevice(), dmxGetInputAttributes(), dmxInputAttachOld(), dmxInputDetach(), dmxInputFreeLocal(), dmxInputInit(), dmxInputLogDevices(), and dmxInputScanForExtensions().

+ +
+
+ +
+
+ + + + +
dmxKBBellProcPtr _DMXLocalInputInfo::kBell
+
+
+

Bell control

+ +

Referenced by _dmxKeyboardBellProc().

+ +
+
+ +
+
+ + + + +
KeybdCtrl _DMXLocalInputInfo::kctrl
+
+
+

Keyboard control

+ +

Referenced by _dmxKeyboardBellProc(), and _dmxKeyboardKbdCtrlProc().

+ +
+
+ +
+
+ + + +
dmxKBCtrlProcPtr _DMXLocalInputInfo::kCtrl
-
- - - - - -
-   - - -

-Pointer control

-

- - - + + + +
+
+
- - - - -
dmxMCtrlProcPtr _DMXLocalInputInfo::mCtrl + +
+

Keyboard control

+ +

Referenced by _dmxKeyboardKbdCtrlProc().

+ +
+ + +
+
+ + + +
int _DMXLocalInputInfo::lastX
-
- - - - - -
-   - - -

-Pointer control

-

- - - - -
- + +
+ +

Referenced by dmxExtMotion().

+ +
+ + +
+
+
- +
const char* _DMXLocalInputInfo::name + int _DMXLocalInputInfo::lastY
-
- - - - - -
-   - - -

-Device name

-

- - - - -
- + +
+

Last known position; for XInput in dmxevents.c

+ +

Referenced by dmxExtMotion().

+ +
+ + +
+
+
- +
dmxOffProcPtr _DMXLocalInputInfo::off + dmxLateReInitProcPtr _DMXLocalInputInfo::latereinit
-
- - - - - -
-   - - -

-Turn device off

-

- - -
- - - - -
dmxOnProcPtr _DMXLocalInputInfo::on + +
+

Reinitialize a device (called very late during a reconfiguration)

+ +

Referenced by dmxInputLateReInit().

+ +
+ + +
+
+ + + +
DMXEventMap _DMXLocalInputInfo::map[DMX_MAP_ENTRIES]
-
- - - - - -
-   - - -

-Turn device on

-

- - - +

Referenced by dmxBackendComputeCenter().

- + + + +
+
+
- - - - -
DeviceIntPtr _DMXLocalInputInfo::pDevice + +
+

XInput device id map

+ +

Referenced by dmxMapClear(), dmxMapInsert(), and dmxMapLookup().

+ +
+ + +
+
+ + + +
int _DMXLocalInputInfo::mapOptimize
-
- - - - - -
-   - - -

-X-level device

-

- - - +

Referenced by dmxConsoleCapture(), and dmxConsoleUncapture().

- + + + +
+
+
- - - - -
pointer _DMXLocalInputInfo::private + +
+

XInput device id map optimization

+ +

Referenced by dmxMapClear(), dmxMapInsert(), and dmxMapLookup().

+ +
+ + +
+
+ + + +
PtrCtrl _DMXLocalInputInfo::mctrl
-
- - - - - -
-   - - -

-Device-dependent private

-

- - - + + + +
+
+
- - - - -
dmxProcessInputProcPtr _DMXLocalInputInfo::process_input + +
+

Pointer control

+ +

Referenced by _dmxChangePointerControl().

+ +
+ + +
+
+ + + +
dmxMCtrlProcPtr _DMXLocalInputInfo::mCtrl
-
- - - - - -
-   - - -

-Process event (from queue)

-

- - - + + + +
+
+
- - - - -
dmxReInitProcPtr _DMXLocalInputInfo::reinit + +
+

Pointer control

+ +

Referenced by _dmxChangePointerControl().

+ +
+ + +
+
+ + + +
const char* _DMXLocalInputInfo::name
-
- - - - - -
-   - - -

-Reinitialize device (during a reconfiguration)

-

- - - + + + +
+
+
- - - - -
int _DMXLocalInputInfo::savedMotionEvents + +
+

Device name

+ +

Referenced by dmxAddDevice(), dmxLookupLocal(), and dmxPopulateLocal().

+ +
+ + +
+
+ + + +
dmxOffProcPtr _DMXLocalInputInfo::off
-
- - - - - -
-   - - -

-Saved motion events

-

- - - + + +

Field Documentation

+ +
+
+
- - - - -
int _DMXLocalInputInfo::savedSendsCore + +
+

Turn device off

+ +
+ + +
+
+ + + +
dmxOnProcPtr _DMXLocalInputInfo::on
-
- - - - - -
-   - - -

-Saved sends-core flag

-

- - - - -
- - -
int _DMXLocalInputInfo::sendsCore -
-
- - - - - -
-   - - -

-Sends DMX core events

-

- - - - -
- - -
int _DMXLocalInputInfo::tail -
-
- - - - - -
-   - - -

-XInput motion history tail

-

- - - - -
- - -
DMXLocalInputType _DMXLocalInputInfo::type -
-
- - - - - -
-   - - -

-Device type

-

- - - + + + +
+
+
- - - - -
dmxUpdateInfoProcPtr _DMXLocalInputInfo::update_info + +
+

Turn device on

+ +
+ + +
+
+ + + + +
DeviceIntPtr _DMXLocalInputInfo::pDevice
+
+
+

X-level device

+ +

Referenced by _dmxChangePointerControl(), _dmxKeyboardBellProc(), _dmxKeyboardKbdCtrlProc(), dmxAddDevice(), dmxCheckFunctionKeys(), dmxCheckSpecialKeys(), dmxCollectAll(), dmxExtMotion(), dmxGetButtonMapping(), dmxGetInputAttributes(), dmxInputAttachNew(), dmxInputAttachOld(), dmxInputDetach(), dmxInputInit(), dmxInputLateReInit(), dmxInputLocateId(), dmxInputLogDevices(), dmxInputReInit(), dmxKeyCodeToKeySym(), dmxKeySymToKeyCode(), dmxProcessInputEvents(), dmxSigioHandler(), and dmxTranslateAndEnqueueExtEvent().

+ +
+
+ +
+
+ + + + +
pointer _DMXLocalInputInfo::private
+
+
+

Device-dependent private

+ +

Referenced by dmxAddDevice(), dmxApplyFunctions(), dmxCommonCopyPrivate(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxCoreMotion(), dmxDump(), dmxExtMotion(), dmxInputFreeLocal(), dmxProcessInputEvents(), dmxSwitchReturn(), dmxUpdateWindowInformation(), and dmxWakeupHandler().

+ +
+
+ +
+
+ + + + +
dmxProcessInputProcPtr _DMXLocalInputInfo::process_input
+
+
+

Process event (from queue)

+ +

Referenced by dmxProcessInputEvents().

+ +
+
+ +
+
+ + + + +
dmxReInitProcPtr _DMXLocalInputInfo::reinit
+
+
+

Reinitialize device (during a reconfiguration)

+ +

Referenced by dmxInputReInit().

+ +
+
+ +
+
+ + + + +
int _DMXLocalInputInfo::savedMotionEvents
+
+
+

Saved motion events

+ +

Referenced by ChangePointerDevice().

+ +
+
+ +
+
+ + + +
int(* _DMXLocalInputInfo::savedMotionProc)(DeviceIntPtr, xTimecoord *, unsigned long, unsigned long, ScreenPtr)
-
- - - - - -
-   - - -

-Update window layout information

-

- - - +

Referenced by _dmxSetCursor(), and dmxMoveCursor().

-
- - - - -
dmxUpdatePositionProcPtr _DMXLocalInputInfo::update_position + +
+ +

Referenced by ChangePointerDevice().

+ +
+ + +
+
+ + + +
int _DMXLocalInputInfo::savedSendsCore
-
- - - - - -
-   - - -

-Called when another device updates the cursor position

-

- - - +

Referenced by dmxInitOverlap(), dmxMoveCursor(), dmxPrintOverlap(), dmxRealizeCursor(), dmxSetCursor(), and dmxUnrealizeCursor().

- + + + +
+
+
- - - - -
int* _DMXLocalInputInfo::valuators + +
+

Saved sends-core flag

+ +

Referenced by ChangeKeyboardDevice(), ChangePointerDevice(), and dmxInputCopyLocal().

+ +
+ + +
+
+ + + +
int _DMXLocalInputInfo::sendsCore
-
- - - - - -
-   - - -

-Cache of previous values

-

- - - +

Referenced by _dmxSetCursor(), dmxCheckCursor(), dmxFindCursor(), and dmxMoveCursor().

- + + + +
+
+
- - - - -
dmxVTPostSwitchProcPtr _DMXLocalInputInfo::vt_post_switch + +
+

Sends DMX core events

+ +

Referenced by ChangeKeyboardDevice(), ChangePointerDevice(), dmxAddDevice(), dmxChangePointerControl(), dmxCheckFunctionKeys(), dmxCoreMotion(), dmxGetInputAttributes(), dmxInputAttachOld(), dmxInputCopyLocal(), dmxInputDetach(), dmxInputLogDevices(), dmxInputScanForExtensions(), dmxKeyboardBellProc(), and dmxKeyboardKbdCtrlProc().

+ +
+ + +
+
+ + + +
int _DMXLocalInputInfo::tail
-
- - - - - -
-   - - -

-Called after a VT switch

-

- - - - -
- + +
+

XInput motion history tail

+ +
+ + +
+
+
- +
dmxVTPreSwitchProcPtr _DMXLocalInputInfo::vt_pre_switch + DMXLocalInputType _DMXLocalInputInfo::type
-
- - - - - -
-   - - -

-Called before a VT switch

-

- - - +

Referenced by _dmxSetCursor().

- + + + +
+
+
- - - - -
dmxVTSwitchProcPtr _DMXLocalInputInfo::vt_switch + +
+

Device type

+ +

Referenced by dmxAddDevice(), dmxConsoleCapture(), dmxConsoleUncapture(), dmxInputFreeLocal(), dmxInputInit(), dmxInputScanForExtensions(), dmxMakeUniqueDeviceName(), dmxPopulateLocal(), and dmxTranslateAndEnqueueExtEvent().

+ +
+ + +
+
+ + + + +
dmxUpdateInfoProcPtr _DMXLocalInputInfo::update_info
+
+
+

Update window layout information

+ +

Referenced by dmxUpdateWindowInformation().

+ +
+
+ +
+
+ + + + +
dmxUpdatePositionProcPtr _DMXLocalInputInfo::update_position
+
+
+

Called when another device updates the cursor position

+ +

Referenced by dmxCoreMotion(), and dmxExtMotion().

+ +
+
+ +
+
+ + + + +
int* _DMXLocalInputInfo::valuators
+
+
+

Cache of previous values

+ +

Referenced by dmxInputFreeLocal().

+ +
+
+ +
+
+ + + + +
dmxVTPostSwitchProcPtr _DMXLocalInputInfo::vt_post_switch
+
+
+

Called after a VT switch

+ +

Referenced by dmxSwitchReturn().

+ +
+
+ +
+
+ + + + +
dmxVTPreSwitchProcPtr _DMXLocalInputInfo::vt_pre_switch
+
+
+

Called before a VT switch

+ +

Referenced by dmxWakeupHandler().

+ +
+
+ +
+
+ + + +
dmxVTSwitchProcPtr _DMXLocalInputInfo::vt_switch
-
- - - - - -
-   - - -

-Causes a VT switch

-
The documentation for this struct was generated from the following file: + +
+

Causes a VT switch

+ +

Referenced by dmxWakeupHandler().

+ +
+ +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html index c83d3f0aa..365f3fd4f 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html @@ -6,1316 +6,1636 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXScreenInfo Struct Reference

#include <dmx.h> -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+

_DMXScreenInfo Struct Reference

+

#include <dmx.h>

+

Data Fields

const char * name
int index
Display * beDisplay
int beWidth
int beHeight
int beDepth
int beBPP
int beXDPI
int beYDPI
int beNumDepths
int * beDepths
int beNumPixmapFormats
XPixmapFormatValues * bePixmapFormats
int beNumVisuals
XVisualInfo * beVisuals
int beDefVisualIndex
int beNumDefColormaps
Colormap * beDefColormaps
Pixel beBlackPixel
Pixel beWhitePixel
Window scrnWin
int scrnX
int scrnY
int scrnWidth
int scrnHeight
int scrnXSign
int scrnYSign
Drawable scrnDefDrawables [MAXFORMATS]
_DMXScreenInfo * next
_DMXScreenInfo * over
Window rootWin
int rootX
int rootY
int rootWidth
int rootHeight
int rootXOrigin
int rootYOrigin
void * shadow
XlibGC shadowGC
XImage * shadowFBImage
int shared
PositionType where
int whereX
int whereY
int whereRefScreen
int savedTimeout
int dpmsCapable
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Data Fields

const char * name
int index
Display * beDisplay
int beWidth
int beHeight
int beDepth
int beBPP
int beXDPI
int beYDPI
int beNumDepths
int * beDepths
int beNumPixmapFormats
XPixmapFormatValues * bePixmapFormats
int beNumVisuals
XVisualInfo * beVisuals
int beDefVisualIndex
int beNumDefColormaps
Colormap * beDefColormaps
Pixel beBlackPixel
Pixel beWhitePixel
Window scrnWin
int scrnX
int scrnY
int scrnWidth
int scrnHeight
int scrnXSign
int scrnYSign
Drawable scrnDefDrawables [MAXFORMATS]
struct _DMXScreenInfo * next
struct _DMXScreenInfo * over
Window rootWin
int rootX
int rootY
int rootWidth
int rootHeight
int rootXOrigin
int rootYOrigin
void * shadow
XlibGC shadowGC
XImage * shadowFBImage
int shared
Bool WMRunningOnBE
Cursor noCursor
Cursor curCursor
CursorPtr cursor
int cursorVisible
int cursorNotShared
PositionType where
int whereX
int whereY
int whereRefScreen
int savedTimeout
int dpmsCapable
int dpmsEnabled
int dpmsStandby
int dpmsSuspend
int dpmsOff
DMXStatInfo * stat
Bool needsSync
CloseScreenProcPtr CloseScreen
SaveScreenProcPtr SaveScreen
CreateGCProcPtr CreateGC
CreateWindowProcPtr CreateWindow
DestroyWindowProcPtr DestroyWindow
PositionWindowProcPtr PositionWindow
ChangeWindowAttributesProcPtr ChangeWindowAttributes
RealizeWindowProcPtr RealizeWindow
UnrealizeWindowProcPtr UnrealizeWindow
RestackWindowProcPtr RestackWindow
WindowExposuresProcPtr WindowExposures
CopyWindowProcPtr CopyWindow
ResizeWindowProcPtr ResizeWindow
ReparentWindowProcPtr ReparentWindow
ChangeBorderWidthProcPtr ChangeBorderWidth
GetImageProcPtr GetImage
GetSpansProcPtr GetSpans
CreatePixmapProcPtr CreatePixmap
DestroyPixmapProcPtr DestroyPixmap
BitmapToRegionProcPtr BitmapToRegion
RealizeFontProcPtr RealizeFont
UnrealizeFontProcPtr UnrealizeFont
CreateColormapProcPtr CreateColormap
DestroyColormapProcPtr DestroyColormap
InstallColormapProcPtr InstallColormap
StoreColorsProcPtr StoreColors
SetShapeProcPtr SetShape
CreatePictureProcPtr CreatePicture
DestroyPictureProcPtr DestroyPicture
ChangePictureClipProcPtr ChangePictureClip
DestroyPictureClipProcPtr DestroyPictureClip
ChangePictureProcPtr ChangePicture
ValidatePictureProcPtr ValidatePicture
CompositeProcPtr Composite
GlyphsProcPtr Glyphs
CompositeRectsProcPtr CompositeRects
InitIndexedProcPtr InitIndexed
CloseIndexedProcPtr CloseIndexed
UpdateIndexedProcPtr UpdateIndexed
TrapezoidsProcPtr Trapezoids
TrianglesProcPtr Triangles
TriStripProcPtr TriStrip
TriFanProcPtr TriFan
+

Detailed Description

+

Global structure containing information about each backend screen.

+

Field Documentation

+ +
+
+ + + + +
Pixel _DMXScreenInfo::beBlackPixel
+
+
+

Default black pixel for BE

+ +

Referenced by dmxBEScreenInit(), and dmxGetColormaps().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beBPP
+
+
+

Bits per pixel of BE display

+ +

Referenced by dmxBEScreenInit(), dmxCompareScreens(), dmxGetScreenAttribs(), dmxInitOrigins(), dmxReInitOrigins(), and dmxScreenInit().

+ +
+
+ +
+
+ + + + +
Colormap* _DMXScreenInfo::beDefColormaps
+
+
+

Default colormaps for DMX server

+ +

Referenced by dmxBECloseScreen(), dmxBEScreenInit(), dmxColormapFromDefaultVisual(), and dmxGetColormaps().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beDefVisualIndex
+
+
+

Default visual index of BE

+ +

Referenced by dmxBECreateCursor(), dmxBEScreenInit(), dmxCompareScreens(), dmxConnectionBlockCallback(), dmxCreateRootWindow(), dmxGetVisualInfo(), dmxPutImage(), and dmxScreenInit().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beDepth
+
+
+

Depth of BE display

+ +

Referenced by dmxBEScreenInit(), dmxCompareScreens(), dmxGetScreenAttribs(), dmxInitOrigins(), and dmxReInitOrigins().

+ +
+
+ +
+
+ + + + +
int* _DMXScreenInfo::beDepths
+
+
+

Depths from BE server

+ +

Referenced by dmxAttachScreen(), dmxBECloseScreen(), dmxBEScreenInit(), dmxCloseScreen(), dmxCompareScreens(), dmxGetPixmapFormats(), dmxScreenInit(), and dmxSetPixmapFormats().

+ +
+
+ +
+
+ + + + +
Display* _DMXScreenInfo::beDisplay
+
+
+

Back-end X server's display

+ +

Referenced by _dmxDPMSInit(), _dmxMoveCursor(), _dmxRealizeCursor(), _dmxSetCursor(), _dmxUnrealizeCursor(), AbortDDX(), dmxAttachScreen(), dmxBackendCollectEvents(), dmxBackendInitPrivate(), dmxBackendPendingMotionEvent(), dmxBackendTestEvents(), dmxBackendTestMotionEvent(), dmxBECloseScreen(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBECreateGC(), dmxBECreateGlyphSet(), dmxBECreatePixmap(), dmxBECreateWindowTree(), dmxBEDestroyWindow(), dmxBEFreeColormap(), dmxBEFreeCursor(), dmxBEFreeFont(), dmxBEFreeGC(), dmxBEFreeGlyphSet(), dmxBEFreePicture(), dmxBEFreePixmap(), dmxBELoadFont(), dmxBERestorePixmap(), dmxBERestoreRenderGlyph(), dmxBESavePixmap(), dmxBEScreenInit(), dmxBitmapToRegion(), dmxChangeBorderWidth(), dmxChangeClip(), dmxChangeGC(), dmxChangePictureClip(), dmxChangeWindowAttributes(), dmxCheckFontPath(), dmxCheckFontPathElement(), dmxCheckForWM(), dmxCloseScreen(), dmxColormapFromDefaultVisual(), dmxCommonAddEnabledDevice(), dmxCommonRemoveEnabledDevice(), dmxCommonXSelect(), dmxComposite(), dmxCompositeRects(), dmxConnectionBlockCallback(), dmxConsoleDraw(), dmxCopyArea(), dmxCopyGC(), dmxCopyPlane(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateColormap(), dmxCreateGC(), dmxCreateNonRootWindow(), dmxCreatePixmap(), dmxCreateRootWindow(), dmxCreateWindow(), dmxDestroyClip(), dmxDestroyColormap(), dmxDestroyGC(), dmxDestroyPictureClip(), dmxDestroyPixmap(), dmxDetachScreen(), dmxDoCreatePicture(), dmxDoRestackWindow(), dmxDoSetShape(), dmxDoSync(), dmxDPMSInit(), dmxDPMSTerm(), dmxFillPolygon(), dmxFindAlternatePixmap(), dmxFindFormat(), dmxGetColormaps(), dmxGetImage(), dmxGetPixmapFormats(), dmxGetScreenAttribs(), dmxGetVisualInfo(), dmxImageText16(), dmxImageText8(), dmxInputAttachBackend(), dmxInstallColormap(), dmxLookupVisual(), dmxLookupVisualFromID(), dmxOpenDisplay(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), dmxPositionWindow(), dmxPrintScreenInfo(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), dmxProcRenderFreeGlyphSet(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxPropertyCheckOtherServers(), dmxPropertyCheckOtherWindows(), dmxPropertyDisplay(), dmxPropertyIterate(), dmxPropertySameDisplay(), dmxPropertyWindow(), dmxPutImage(), dmxRealizeFont(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeScreenWindow(), dmxResizeWindow(), dmxSaveScreen(), dmxSetFontPath(), dmxSetPixmapFormats(), dmxShadowUpdateProc(), dmxStoreColors(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), dmxUnrealizeFont(), dmxUnrealizeWindow(), dmxValidatePicture(), dmxWindowExposures(), and InitOutput().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beHeight
+
+
+

Height of BE display

+ +

Referenced by dmxBackendMouGetInfo(), dmxCompareScreens(), dmxGetScreenAttribs(), dmxInitOrigins(), and dmxReInitOrigins().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beNumDefColormaps
+
+
+

Number of default colormaps

+ +

Referenced by dmxBECloseScreen(), dmxColormapFromDefaultVisual(), and dmxGetColormaps().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beNumDepths
+
+
+

Number of depths on BE server

+ +

Referenced by dmxBEScreenInit(), dmxCompareScreens(), dmxGetPixmapFormats(), dmxScreenInit(), and dmxSetPixmapFormats().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beNumPixmapFormats
+
+
+

Number of pixmap formats on BE

+ +

Referenced by dmxBECloseScreen(), dmxBECreateCursor(), dmxBECreateGC(), dmxBERestorePixmap(), dmxBEScreenInit(), dmxCompareScreens(), dmxGetPixmapFormats(), and dmxSetPixmapFormats().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beNumVisuals
+
+
+

Number of visuals on BE

+ +

Referenced by dmxCompareScreens(), dmxGetColormaps(), dmxGetVisualInfo(), dmxLookupVisual(), dmxScreenInit(), and InitOutput().

+ +
+
+ +
+
+ + + + +
XPixmapFormatValues* _DMXScreenInfo::bePixmapFormats
+
+
+

Pixmap formats on BE

+ +

Referenced by dmxAttachScreen(), dmxBECloseScreen(), dmxBECreateCursor(), dmxBECreateGC(), dmxBERestorePixmap(), dmxBEScreenInit(), dmxCloseScreen(), dmxCompareScreens(), dmxGetPixmapFormats(), and dmxSetPixmapFormats().

+ +
+
+ +
+
+ + + + +
XVisualInfo* _DMXScreenInfo::beVisuals
+
+
+

Visuals from BE server

+ +

Referenced by dmxAttachScreen(), dmxBECloseScreen(), dmxBECreateCursor(), dmxBEScreenInit(), dmxCloseScreen(), dmxColormapFromDefaultVisual(), dmxCompareScreens(), dmxConnectionBlockCallback(), dmxCreateRootWindow(), dmxGetColormaps(), dmxGetVisualInfo(), dmxLookupVisual(), dmxPutImage(), dmxScreenInit(), and InitOutput().

+ +
+
+ +
+
+ + + + +
Pixel _DMXScreenInfo::beWhitePixel
+
+
+

Default white pixel for BE

+ +

Referenced by dmxBEScreenInit(), and dmxGetColormaps().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beWidth
+
+
+

Width of BE display

+ +

Referenced by dmxBackendMouGetInfo(), dmxCompareScreens(), dmxGetScreenAttribs(), dmxInitOrigins(), and dmxReInitOrigins().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beXDPI
+
+
+

Horizontal dots per inch of BE

+ +

Referenced by dmxGetScreenAttribs(), dmxScreenInit(), and dmxUpdateScreenResources().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::beYDPI
+
+
+

Vertical dots per inch of BE

+ +

Referenced by dmxGetScreenAttribs(), and dmxUpdateScreenResources().

+ +
+
+ +
+
+ + + + +
BitmapToRegionProcPtr _DMXScreenInfo::BitmapToRegion
+
+
+ +
+
+ +
+
+ + + + +
ChangeBorderWidthProcPtr _DMXScreenInfo::ChangeBorderWidth
+
+
+ +
+
+ +
+
+ + + + +
ChangePictureProcPtr _DMXScreenInfo::ChangePicture
+
+
+ +
+
+ +
+
+ + + + +
ChangePictureClipProcPtr _DMXScreenInfo::ChangePictureClip
+
+
+ +
+
+ +
+
+ + + + +
ChangeWindowAttributesProcPtr _DMXScreenInfo::ChangeWindowAttributes
+
+
+ +
+
+ +
+
+ + + + +
CloseIndexedProcPtr _DMXScreenInfo::CloseIndexed
+
+
+ +
+
+ +
+
+ + + + +
CloseScreenProcPtr _DMXScreenInfo::CloseScreen
+
+
+

Function pointers to wrapped screen functions

+ +
+
+ +
+
+ + + + +
CompositeProcPtr _DMXScreenInfo::Composite
+
+
+ +
+
+ +
+
+ + + + +
CompositeRectsProcPtr _DMXScreenInfo::CompositeRects
+
+
+ +
+
+ +
+
+ + + + +
CopyWindowProcPtr _DMXScreenInfo::CopyWindow
+
+
+ +
+
+ +
+
+ + + + +
CreateColormapProcPtr _DMXScreenInfo::CreateColormap
+
+
+ +
+
+ +
+
+ + + + +
CreateGCProcPtr _DMXScreenInfo::CreateGC
+
+
+ +
+
+ +
+
+ + + + +
CreatePictureProcPtr _DMXScreenInfo::CreatePicture
+
+
+ +
+
+ +
+
+ + + + +
CreatePixmapProcPtr _DMXScreenInfo::CreatePixmap
+
+
+ +
+
+ +
+
+ + + + +
CreateWindowProcPtr _DMXScreenInfo::CreateWindow
+
+
+ +
+
+ +
+
+ + + + +
Cursor _DMXScreenInfo::curCursor
+
+
-
int dpmsEnabled
int dpmsStandby
+ + + +
CursorPtr _DMXScreenInfo::cursor
+ +

-
int dpmsSuspend
int dpmsOff
+ + + +
int _DMXScreenInfo::cursorNotShared
+ +

-
DMXStatInfo * stat
Bool needsSync
+ + + +
int _DMXScreenInfo::cursorVisible
+ +

-
CloseScreenProcPtr CloseScreen
-

Detailed Description

-Global structure containing information about each backend screen. -

-

Field Documentation

-

- - - - -
- - -
Pixel _DMXScreenInfo::beBlackPixel -
-
- - - - - -
-   - - -

-Default black pixel for BE

-

- - - - -
- + + + +
+
+
- +
int _DMXScreenInfo::beBPP + DestroyColormapProcPtr _DMXScreenInfo::DestroyColormap
-
- - - - - -
-   - - -

-Bits per pixel of BE display

-

- - - - -
- + +
+ +
+ + +
+
+
- +
Colormap* _DMXScreenInfo::beDefColormaps + DestroyPictureProcPtr _DMXScreenInfo::DestroyPicture
-
- - - - - -
-   - - -

-Default colormaps for DMX server

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::beDefVisualIndex + DestroyPictureClipProcPtr _DMXScreenInfo::DestroyPictureClip
-
- - - - - -
-   - - -

-Default visual index of BE

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::beDepth + DestroyPixmapProcPtr _DMXScreenInfo::DestroyPixmap
-
- - - - - -
-   - - -

-Depth of BE display

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int* _DMXScreenInfo::beDepths + DestroyWindowProcPtr _DMXScreenInfo::DestroyWindow
-
- - - - - -
-   - - -

-Depths from BE server

-

- - - - -
- + +
+ +
+ + +
+
+
- +
Display* _DMXScreenInfo::beDisplay + int _DMXScreenInfo::dpmsCapable
-
- - - - - -
-   - - -

-Back-end X server's display

-

- - - - -
- + +
+

Non-zero if backend is DPMS capable

+ +

Referenced by _dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beHeight + int _DMXScreenInfo::dpmsEnabled
-
- - - - - -
-   - - -

-Height of BE display

-

- - - - -
- + +
+

Non-zero if DPMS enabled

+ +

Referenced by _dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beNumDefColormaps + int _DMXScreenInfo::dpmsOff
-
- - - - - -
-   - - -

-Number of default colormaps

-

- - - - -
- + +
+

Original DPMS off value

+ +

Referenced by _dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beNumDepths + int _DMXScreenInfo::dpmsStandby
-
- - - - - -
-   - - -

-Number of depths on BE server

-

- - - - -
- + +
+

Original DPMS standby value

+ +

Referenced by _dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beNumPixmapFormats + int _DMXScreenInfo::dpmsSuspend
-
- - - - - -
-   - - -

-Number of pixmap formats on BE

-

- - - - -
- + +
+

Original DPMS suspend value

+ +

Referenced by _dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beNumVisuals + GetImageProcPtr _DMXScreenInfo::GetImage
-
- - - - - -
-   - - -

-Number of visuals on BE

-

- - - - -
- + +
+ +
+ + +
+
+
- +
XPixmapFormatValues* _DMXScreenInfo::bePixmapFormats + GetSpansProcPtr _DMXScreenInfo::GetSpans
-
- - - - - -
-   - - -

-Pixmap formats on BE

-

- - - - -
- + +
+ +
+ + +
+
+
- +
XVisualInfo* _DMXScreenInfo::beVisuals + GlyphsProcPtr _DMXScreenInfo::Glyphs
-
- - - - - -
-   - - -

-Visuals from BE server

-

- - - - -
- + +
+ +
+ + +
+
+
- +
Pixel _DMXScreenInfo::beWhitePixel + int _DMXScreenInfo::index
-
- - - - - -
-   - - -

-Default white pixel for BE

-

- - - - -
- + +
+

Index into dmxScreens global

+ +

Referenced by dmxBackendCollectEvents(), dmxBackendFindOverlapping(), dmxBackendInit(), dmxBackendTestScreen(), dmxCheckCursor(), dmxConfigAddDisplay(), dmxCoreMotion(), dmxCreateWindow(), dmxCursorOffScreen(), dmxGetScreenAttributes(), dmxHeader(), dmxHideCursor(), dmxInitOverlap(), dmxInputDetach(), dmxInputDetachAll(), dmxMoveCursor(), dmxOnScreen(), dmxPrintOverlap(), dmxPropertyWindow(), dmxRealizeCursor(), dmxSetCursor(), and dmxUnrealizeCursor().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::beWidth + InitIndexedProcPtr _DMXScreenInfo::InitIndexed
-
- - - - - -
-   - - -

-Width of BE display

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::beXDPI + InstallColormapProcPtr _DMXScreenInfo::InstallColormap
-
- - - - - -
-   - - -

-Horizontal dots per inch of BE

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::beYDPI + const char* _DMXScreenInfo::name
-
- - - - - -
-   - - -

-Vertical dots per inch of BE

-

- - - - -
- + +
+

Name from command line or config file

+ +

Referenced by dmxAttachScreen(), dmxBackendCollectEvents(), dmxConfigAddDisplay(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxDisplayInit(), dmxGetScreenAttributes(), dmxHeader(), dmxInitOverlap(), dmxInputAttachBackend(), dmxOpenDisplay(), dmxPrintOverlap(), dmxPropertyCheckOtherServers(), dmxPropertyCheckOtherWindows(), dmxPropertySameDisplay(), dmxPropertyWindow(), and dmxSync().

+ +
+ + +
+
+
- +
CloseScreenProcPtr _DMXScreenInfo::CloseScreen + Bool _DMXScreenInfo::needsSync
-
- - - - - -
-   - - -

-Function pointers to wrapped screen functions

-

- - - - -
- + +
+

True if an XSync is pending

+ +

Referenced by dmxDoSync(), dmxSync(), and dmxSyncCallback().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::dpmsCapable + struct _DMXScreenInfo* _DMXScreenInfo::next [read]
-
- - - - - -
-   - - -

-Non-zero if backend is DPMS capable

-

- - - - -
- + +
+

List of "screens" on same display

+ +

Referenced by dmxPropertyIterate(), and dmxPropertyWindow().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::dpmsEnabled + Cursor _DMXScreenInfo::noCursor
-
- - - - - -
-   - - -

-Non-zero if DPMS enabled

-

- - - - -
- + +
+ +

Referenced by _dmxSetCursor(), dmxBECloseScreen(), and dmxBEScreenInit().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::dpmsOff + struct _DMXScreenInfo* _DMXScreenInfo::over [read]
-
- - - - - -
-   - - -

-Original DPMS off value

-

- - - - -
- + +
+

List of "screens" that overlap

+ +

Referenced by dmxBackendFindOverlapping(), dmxFindCursor(), dmxInitOverlap(), dmxIterateOverlap(), dmxMoveCursor(), dmxRealizeCursor(), dmxSetCursor(), and dmxUnrealizeCursor().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::dpmsStandby + PositionWindowProcPtr _DMXScreenInfo::PositionWindow
-
- - - - - -
-   - - -

-Original DPMS standby value

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::dpmsSuspend + RealizeFontProcPtr _DMXScreenInfo::RealizeFont
-
- - - - - -
-   - - -

-Original DPMS suspend value

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::index + RealizeWindowProcPtr _DMXScreenInfo::RealizeWindow
-
- - - - - -
-   - - -

-Index into dmxScreens global

-

- - - - -
- + +
+ +
+ + +
+
+
- +
const char* _DMXScreenInfo::name + ReparentWindowProcPtr _DMXScreenInfo::ReparentWindow
-
- - - - - -
-   - - -

-Name from command line or config file

-

- - - - -
- + +
+ +
+ + +
+
+
- +
Bool _DMXScreenInfo::needsSync + ResizeWindowProcPtr _DMXScreenInfo::ResizeWindow
-
- - - - - -
-   - - -

-True if an XSync is pending

-

- - - - -
- + +
+ +
+ + +
+
+
- +
struct _DMXScreenInfo* _DMXScreenInfo::next + RestackWindowProcPtr _DMXScreenInfo::RestackWindow
-
- - - - - -
-   - - -

-List of "screens" on same display

-

- - - - -
- + +
+ +
+ + +
+
+
- +
struct _DMXScreenInfo* _DMXScreenInfo::over + int _DMXScreenInfo::rootHeight
-
- - - - - -
-   - - -

-List of "screens" that overlap

-

- - - - -
- + +
+

Height of "root" window

+ +

Referenced by dmxBackendCollectEvents(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxCursorOffScreen(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootHeight + int _DMXScreenInfo::rootWidth
-
- - - - - -
-   - - -

-Height of "root" window

-

- - - - -
- + +
+

Width of "root" window

+ +

Referenced by dmxBackendCollectEvents(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxCursorOffScreen(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootWidth + Window _DMXScreenInfo::rootWin
-
- - - - - -
-   - - -

-Width of "root" window

-

- - - - -
- + +
+

"Root" window on backend display

+ +

Referenced by dmxBECreateWindowTree(), and dmxCreateWindow().

+ +
+ + +
+
+
- +
Window _DMXScreenInfo::rootWin + int _DMXScreenInfo::rootX
-
- - - - - -
-   - - -

-"Root" window on backend display

-

- - - - -
- + +
+

X offset of "root" window WRT "screen"

+ +

Referenced by _dmxMoveCursor(), dmxBackendCollectEvents(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootX + int _DMXScreenInfo::rootXOrigin
-
- - - - - -
-   - - -

-X offset of "root" window WRT "screen"

-

- - - - -
- + +
+

Global X origin of "root" window

+ +

Referenced by dmxBackendCollectEvents(), dmxCheckCursor(), dmxComputeWidthHeight(), dmxCoreMotion(), dmxCursorOffScreen(), dmxDoesOverlap(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxMoveCursor(), dmxOnScreen(), dmxReInitOrigins(), and dmxSetCursor().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootXOrigin + int _DMXScreenInfo::rootY
-
- - - - - -
-   - - -

-Global X origin of "root" window

-

- - - - -
- + +
+

Y offset of "root" window WRT "screen"

+ +

Referenced by _dmxMoveCursor(), dmxBackendCollectEvents(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootY + int _DMXScreenInfo::rootYOrigin
-
- - - - - -
-   - - -

-Y offset of "root" window WRT "screen"

-

- - - - -
- + +
+

Global Y origin of "root" window

+ +

Referenced by dmxBackendCollectEvents(), dmxCheckCursor(), dmxComputeWidthHeight(), dmxCoreMotion(), dmxCursorOffScreen(), dmxDoesOverlap(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxMoveCursor(), dmxOnScreen(), dmxReInitOrigins(), and dmxSetCursor().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::rootYOrigin + int _DMXScreenInfo::savedTimeout
-
- - - - - -
-   - - -

-Global Y origin of "root" window

-

- - - - -
- + +
+

Original screen saver timeout

+ +

Referenced by dmxDPMSInit(), and dmxDPMSTerm().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::savedTimeout + SaveScreenProcPtr _DMXScreenInfo::SaveScreen
-
- - - - - -
-   - - -

-Original screen saver timeout

-

- - - - -
- + +
+ +
+ + +
+
+
- +
Drawable _DMXScreenInfo::scrnDefDrawables[MAXFORMATS] + Drawable _DMXScreenInfo::scrnDefDrawables[MAXFORMATS]
-
- - - - - -
-   - - -

-Default drawables for "screen"

-

- - - - -
- + +
+

Default drawables for "screen"

+ +

Referenced by dmxBECloseScreen(), dmxBECreateCursor(), dmxBECreateGC(), dmxBERestorePixmap(), and dmxBEScreenInit().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnHeight + int _DMXScreenInfo::scrnHeight
-
- - - - - -
-   - - -

-Height of "screen"

-

- - - - -
- + +
+

Height of "screen"

+ +

Referenced by dmxBEScreenInit(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxDoesOverlap(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), dmxReInitOrigins(), and dmxScreenInit().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnWidth + int _DMXScreenInfo::scrnWidth
-
- - - - - -
-   - - -

-Width of "screen"

-

- - - - -
- + +
+

Width of "screen"

+ +

Referenced by dmxBEScreenInit(), dmxComputeWidthHeight(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxDoesOverlap(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), dmxReInitOrigins(), and dmxScreenInit().

+ +
+ + +
+
+
- +
Window _DMXScreenInfo::scrnWin + Window _DMXScreenInfo::scrnWin
-
- - - - - -
-   - - -

-"Screen" window on backend display

-

- - - - -
- + +
+

"Screen" window on backend display

+ +

Referenced by _dmxMoveCursor(), _dmxSetCursor(), dmxBackendCollectEvents(), dmxBackendInitPrivate(), dmxBackendTestWindow(), dmxBECloseScreen(), dmxBECreateColormap(), dmxBECreateCursor(), dmxBECreatePixmap(), dmxBEScreenInit(), dmxCommonXSelect(), dmxCreateRootWindow(), dmxPropertyWindow(), dmxResizeScreenWindow(), and dmxShadowUpdateProc().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnX + int _DMXScreenInfo::scrnX
-
- - - - - -
-   - - -

-X offset of "screen" WRT BE display

-

- - - - -
- + +
+

X offset of "screen" WRT BE display

+ +

Referenced by dmxBEScreenInit(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnXSign + int _DMXScreenInfo::scrnXSign
-
- - - - - -
-   - - -

-X offset sign of "screen"

-

- - - - -
- + +
+

X offset sign of "screen"

+ +

Referenced by dmxConfigAddDisplay(), and dmxGetScreenAttribs().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnY + int _DMXScreenInfo::scrnY
-
- - - - - -
-   - - -

-Y offset of "screen" WRT BE display

-

- - - - -
- + +
+

Y offset of "screen" WRT BE display

+ +

Referenced by dmxBEScreenInit(), dmxConfigAddDisplay(), dmxCreateWindow(), dmxGetScreenAttribs(), dmxGetScreenAttributes(), dmxInitOrigins(), dmxOnScreen(), and dmxReInitOrigins().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::scrnYSign + int _DMXScreenInfo::scrnYSign
-
- - - - - -
-   - - -

-Y offset sign of "screen"

-

- - - - -
- + +
+

Y offset sign of "screen"

+ +

Referenced by dmxConfigAddDisplay(), and dmxGetScreenAttribs().

+ +
+ + +
+
+
- +
void* _DMXScreenInfo::shadow + SetShapeProcPtr _DMXScreenInfo::SetShape
-
- - - - - -
-   - - -

-Shadow framebuffer data (if enabled)

-

- - - - -
- + +
+ +
+ + +
+
+
- +
XImage* _DMXScreenInfo::shadowFBImage + void* _DMXScreenInfo::shadow
-
- - - - - -
-   - - -

-Screen image used by shadow FB code

-

- - - - -
- + +
+

Shadow framebuffer data (if enabled)

+ +

Referenced by dmxBEScreenInit(), dmxCloseScreen(), and dmxScreenInit().

+ +
+ + +
+
+
- +
XlibGC _DMXScreenInfo::shadowGC + XImage* _DMXScreenInfo::shadowFBImage
-
- - - - - -
-   - - -

-Default GC used by shadow FB code

-

- - - - -
- + +
+

Screen image used by shadow FB code

+ +

Referenced by dmxBECloseScreen(), dmxBEScreenInit(), and dmxShadowUpdateProc().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::shared + XlibGC _DMXScreenInfo::shadowGC
-
- - - - - -
-   - - -

-Non-zero if another Xdmx is running

-

- - - - -
- + +
+

Default GC used by shadow FB code

+ +

Referenced by dmxBECloseScreen(), dmxBEScreenInit(), and dmxShadowUpdateProc().

+ +
+ + +
+
+
- +
DMXStatInfo* _DMXScreenInfo::stat + int _DMXScreenInfo::shared
-
- - - - - -
-   - - -

-Statistics about XSync

-

- - - - -
- + +
+

Non-zero if another Xdmx is running

+ +

Referenced by dmxPropertyDisplay().

+ +
+ + +
+
+
- +
PositionType _DMXScreenInfo::where + DMXStatInfo* _DMXScreenInfo::stat
-
- - - - - -
-   - - -

-Relative layout information

-

- - - - -
- + +
+

Statistics about XSync

+ +

Referenced by dmxConfigAddDisplay(), dmxStatCallback(), dmxStatSync(), and InitOutput().

+ +
+ + +
+
+
- +
int _DMXScreenInfo::whereRefScreen + StoreColorsProcPtr _DMXScreenInfo::StoreColors
-
- - - - - -
-   - - -

-Relative layout information

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::whereX + TrapezoidsProcPtr _DMXScreenInfo::Trapezoids
-
- - - - - -
-   - - -

-Relative layout information

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _DMXScreenInfo::whereY + TrianglesProcPtr _DMXScreenInfo::Triangles
-
- - - - - -
-   - - -

-Relative layout information

-

The documentation for this struct was generated from the following file: + +
+ +
+ + +
+
+ + + + +
TriFanProcPtr _DMXScreenInfo::TriFan
+
+
+ +
+
+ +
+
+ + + + +
TriStripProcPtr _DMXScreenInfo::TriStrip
+
+
+ +
+
+ +
+
+ + + + +
UnrealizeFontProcPtr _DMXScreenInfo::UnrealizeFont
+
+
+ +
+
+ +
+
+ + + + +
UnrealizeWindowProcPtr _DMXScreenInfo::UnrealizeWindow
+
+
+ +
+
+ +
+
+ + + + +
UpdateIndexedProcPtr _DMXScreenInfo::UpdateIndexed
+
+
+ +
+
+ +
+
+ + + + +
ValidatePictureProcPtr _DMXScreenInfo::ValidatePicture
+
+
+ +
+
+ +
+
+ + + + +
PositionType _DMXScreenInfo::where
+
+
+

Relative layout information

+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxInitOrigins(), and dmxTryComputeScreenOrigins().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::whereRefScreen
+
+
+

Relative layout information

+ +

Referenced by dmxComputeScreenOrigins(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), and dmxTryComputeScreenOrigins().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::whereX
+
+
+

Relative layout information

+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxInitOrigins(), and dmxTryComputeScreenOrigins().

+ +
+
+ +
+
+ + + + +
int _DMXScreenInfo::whereY
+
+
+

Relative layout information

+ +

Referenced by dmxConfigCopyFromDisplay(), dmxConfigCopyFromWall(), dmxConfigFromCommandLine(), dmxInitOrigins(), and dmxTryComputeScreenOrigins().

+ +
+
+ +
+
+ + + + +
WindowExposuresProcPtr _DMXScreenInfo::WindowExposures
+
+
+ +
+
+ +
+
+ + + + +
Bool _DMXScreenInfo::WMRunningOnBE
+
+
+ +

Referenced by dmxCheckForWM(), and dmxPrintScreenInfo().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html b/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html index feb264dcb..7fcb44ae7 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html @@ -6,16 +6,82 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXStatAvg Struct Reference

- + + +
+

_DMXStatAvg Struct Reference

+ + + +

Data Fields

int pos
int count
unsigned long value [DMX_STAT_LENGTH]
-

Detailed Description

-Used to compute a running average of value. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Used to compute a running average of value.

+

Field Documentation

+ +
+
+ + + + +
int _DMXStatAvg::count
+
+
+ +

Referenced by avg(), and dmxStatValue().

+ +
+
+ +
+
+ + + + +
int _DMXStatAvg::pos
+
+
+ +

Referenced by dmxStatValue().

+ +
+
+ +
+
+ + + + +
unsigned long _DMXStatAvg::value[DMX_STAT_LENGTH]
+
+
+ +

Referenced by avg(), and dmxStatValue().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html index eff756130..3a0fd0540 100644 --- a/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html +++ b/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html @@ -6,16 +6,114 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_DMXStatInfo Struct Reference

- + + +
+

_DMXStatInfo Struct Reference

+ + + + + +

Data Fields

unsigned long syncCount
unsigned long oldSyncCount
DMXStatAvg usec
DMXStatAvg pending
unsigned long bins [DMX_STAT_BINS]
-

Detailed Description

-Statistical information about XSync calls. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Statistical information about XSync calls.

+

Field Documentation

+ +
+
+ + + + +
unsigned long _DMXStatInfo::bins[DMX_STAT_BINS]
+
+
+ +

Referenced by dmxStatCallback(), and dmxStatSync().

+ +
+
+ +
+
+ + + + +
unsigned long _DMXStatInfo::oldSyncCount
+
+
+ +

Referenced by dmxStatCallback().

+ +
+
+ +
+
+ + + + +
DMXStatAvg _DMXStatInfo::pending
+
+
+ +

Referenced by dmxStatCallback(), and dmxStatSync().

+ +
+
+ +
+
+ + + + +
unsigned long _DMXStatInfo::syncCount
+
+
+ +

Referenced by dmxStatCallback(), and dmxStatSync().

+ +
+
+ +
+
+ + + + +
DMXStatAvg _DMXStatInfo::usec
+
+
+ +

Referenced by dmxStatCallback(), and dmxStatSync().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__Event.html b/xorg-server/hw/dmx/doc/html/struct__Event.html deleted file mode 100644 index cb9b65bc3..000000000 --- a/xorg-server/hw/dmx/doc/html/struct__Event.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_Event Struct Reference

- - - - - - - - -

Data Fields

xEvent event
ScreenPtr pScreen
deviceValuator valuator
-

Detailed Description

-Information about the event. -

-

Field Documentation

-

- - - - -
- - -
xEvent _Event::event -
-
- - - - - -
-   - - -

-Event.

-

- - - - -
- - -
ScreenPtr _Event::pScreen -
-
- - - - - -
-   - - -

-Screen on which event occurred.

-

- - - - -
- - -
deviceValuator _Event::valuator -
-
- - - - - -
-   - - -

-XInput device valuator information.

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/struct__EventQueue.html b/xorg-server/hw/dmx/doc/html/struct__EventQueue.html deleted file mode 100644 index abcc33aa2..000000000 --- a/xorg-server/hw/dmx/doc/html/struct__EventQueue.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_EventQueue Struct Reference

- - - - - - - - - - - - - - - - - - -

Data Fields

HWEventQueueType head
HWEventQueueType tail
CARD32 lastEventTime
Bool lastMotion
EventRec events [QUEUE_SIZE]
DevicePtr pPtr
ScreenPtr pEnqueueScreen
ScreenPtr pDequeueScreen
-

Detailed Description

-Event queue. -

-

Field Documentation

-

- - - - -
- - -
EventRec _EventQueue::events[QUEUE_SIZE] -
-
- - - - - -
-   - - -

-Static allocation for signals.

-

- - - - -
- - -
HWEventQueueType _EventQueue::head -
-
- - - - - -
-   - - -

-Queue head; must be long for SetInputCheck.

-

- - - - -
- - -
CARD32 _EventQueue::lastEventTime -
-
- - - - - -
-   - - -

-To avoid time running backwards.

-

- - - - -
- - -
Bool _EventQueue::lastMotion -
-
- - - - - -
-   - - -

-True if last event was motion.

-

- - - - -
- - -
ScreenPtr _EventQueue::pDequeueScreen -
-
- - - - - -
-   - - -

-Screen events are dispatched to.

-

- - - - -
- - -
ScreenPtr _EventQueue::pEnqueueScreen -
-
- - - - - -
-   - - -

-Screen events are delivered to.

-

- - - - -
- - -
DevicePtr _EventQueue::pPtr -
-
- - - - - -
-   - - -

-Device pointers (to get funcs)

-

- - - - -
- - -
HWEventQueueType _EventQueue::tail -
-
- - - - - -
-   - - -

-Queue tail; must be long for SetInputCheck.

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxArg.html b/xorg-server/hw/dmx/doc/html/struct__dmxArg.html index 16ef20aed..1694271bf 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxArg.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxArg.html @@ -6,90 +6,85 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxArg Struct Reference

- - - - - - - - + + +
+

_dmxArg Struct Reference


Data Fields

int argc
int argm
const char ** argv
+ + + +

Data Fields

int argc
int argm
const char ** argv
-

Detailed Description

-Stores the parsed argument list. -

-

Field Documentation

-

- - - - -
- +

Detailed Description

+

Stores the parsed argument list.

+

Field Documentation

+ +
+
+
- +
int _dmxArg::argc + int _dmxArg::argc
-
- - - - - -
-   - + +
+

Number of arguments in argv

-

-Number of arguments in argv

-

- - - - -
- +

Referenced by dmxArgAdd(), dmxArgC(), dmxArgCreate(), dmxArgFree(), and dmxArgV().

+ + + + +
+
+
- +
int _dmxArg::argm + int _dmxArg::argm
-
- - - - - -
-   - + +
+

Maximum number of arguments store-able in argv

-

-Maximum number of arguments store-able in argv

-

- - - - -
- +

Referenced by dmxArgAdd(), and dmxArgCreate().

+ + + + +
+
+
- +
const char** _dmxArg::argv + const char** _dmxArg::argv
-
- - - - - -
-   - + +
+

Arguments

-

-Arguments

-

The documentation for this struct was generated from the following file: +

Referenced by dmxArgAdd(), dmxArgCreate(), dmxArgFree(), and dmxArgV().

+ + + +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html index 531e96ee2..72468bbf4 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html @@ -6,18 +6,52 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxColormapPriv Struct Reference

#include <dmxcmap.h> -

- - + + +
+

_dmxColormapPriv Struct Reference

+

#include <dmxcmap.h>

+
+ +

Data Fields

Colormap cmap
-

Detailed Description

-Colormap private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Colormap private area.

+

Field Documentation

+ +
+
+ + + + +
Colormap _dmxColormapPriv::cmap
+
+
+ +

Referenced by dmxAllocateColormapPrivates(), dmxBECreateColormap(), dmxBEFreeColormap(), dmxCreateRootWindow(), dmxDoChangeWindowAttributes(), dmxGetDefaultWindowAttributes(), dmxInstallColormap(), and dmxStoreColors().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html index 3891b8f3a..13187c67d 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html @@ -6,18 +6,52 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxCursorPriv Struct Reference

#include <dmxcursor.h> -

- - + + +
+

_dmxCursorPriv Struct Reference

+

#include <dmxcursor.h>

+
+ +

Data Fields

Cursor cursor
-

Detailed Description

-Cursor private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Cursor private area.

+

Field Documentation

+ +
+
+ + + + +
Cursor _dmxCursorPriv::cursor
+
+
+ +

Referenced by _dmxRealizeCursor(), _dmxSetCursor(), dmxBECreateCursor(), and dmxBEFreeCursor().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html index adff77f04..7b4c457d5 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html @@ -6,18 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxFontPriv Struct Reference

#include <dmxfont.h> -

- - + + +
+

_dmxFontPriv Struct Reference

+

#include <dmxfont.h>

+
+ + +

Data Fields

int refcnt
XFontStruct ** font
-

Detailed Description

-Font private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Font private area.

+

Field Documentation

+ +
+
+ + + + +
XFontStruct** _dmxFontPriv::font
+
+
+ +

Referenced by dmxBEFreeFont(), dmxBELoadFont(), dmxChangeGC(), dmxRealizeFont(), and dmxUnrealizeFont().

+ +
+
+ +
+
+ + + + +
int _dmxFontPriv::refcnt
+
+
+ +

Referenced by dmxRealizeFont(), and dmxUnrealizeFont().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html index 9a7b0fd25..eaa249d5c 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html @@ -6,18 +6,100 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxGCPriv Struct Reference

#include <dmxgc.h> -

- - + + +
+

_dmxGCPriv Struct Reference

+

#include <dmxgc.h>

+
+ + + + +

Data Fields

GCOps * ops
GCFuncs * funcs
XlibGC gc
Bool msc
-

Detailed Description

-GC private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

GC private area.

+

Field Documentation

+ +
+
+ + + + +
GCFuncs* _dmxGCPriv::funcs
+
+
+ +

Referenced by dmxCreateGC().

+ +
+
+ +
+
+ + + + +
XlibGC _dmxGCPriv::gc
+
+
+ +

Referenced by dmxBECreateGC(), dmxBEFreeGC(), dmxChangeClip(), dmxChangeGC(), dmxCopyArea(), dmxCopyGC(), dmxCopyPlane(), dmxCreateGC(), dmxDestroyClip(), dmxFillPolygon(), dmxImageText16(), dmxImageText8(), dmxPolyArc(), dmxPolyFillArc(), dmxPolyFillRect(), dmxPolylines(), dmxPolyPoint(), dmxPolyRectangle(), dmxPolySegment(), dmxPolyText16(), dmxPolyText8(), and dmxPutImage().

+ +
+
+ +
+
+ + + + +
Bool _dmxGCPriv::msc
+
+
+ +

Referenced by dmxChangeGC(), and dmxCreateGC().

+ +
+
+ +
+
+ + + + +
GCOps* _dmxGCPriv::ops
+
+
+ +

Referenced by dmxCreateGC(), and dmxValidateGC().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html index c7738a4b6..e113e3710 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html @@ -6,44 +6,53 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxGlyphPriv Struct Reference

#include <dmxpict.h> -

- - - - - + + +
+

_dmxGlyphPriv Struct Reference

+

#include <dmxpict.h>

+

Data Fields

GlyphSet * glyphSets
+ +

Data Fields

GlyphSet * glyphSets
-

Detailed Description

-Glyph Set private structure -

-

Field Documentation

-

- - - - -
- +

Detailed Description

+

Glyph Set private structure

+

Field Documentation

+ +
+
+
- +
GlyphSet* _dmxGlyphPriv::glyphSets + GlyphSet* _dmxGlyphPriv::glyphSets
-
- - - - - -
-   - + +
+

Glyph Set IDs from back-end server

-

-Glyph Set IDs from back-end server

-

The documentation for this struct was generated from the following file: +

Referenced by dmxBECreateGlyphSet(), dmxBEFreeGlyphSet(), dmxBERestoreRenderGlyph(), dmxProcRenderAddGlyphs(), dmxProcRenderCompositeGlyphs(), dmxProcRenderCreateGlyphSet(), dmxProcRenderFreeGlyphs(), and dmxProcRenderFreeGlyphSet().

+ + + +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html index c3034eefa..beaf8e3cc 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html @@ -6,68 +6,70 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxPictPriv Struct Reference

#include <dmxpict.h> -

- - - - - - - + + +
+

_dmxPictPriv Struct Reference

+

#include <dmxpict.h>

+

Data Fields

Picture pict
Mask savedMask
+ + +

Data Fields

Picture pict
Mask savedMask
-

Detailed Description

-Picture private structure -

-

Field Documentation

-

- - - - -
- +

Detailed Description

+

Picture private structure

+

Field Documentation

+ +
+
+
- +
Picture _dmxPictPriv::pict + Picture _dmxPictPriv::pict
-
- - - - - -
-   - + +
+

Picture ID from back-end server

-

-Picture ID from back-end server

-

- - - - -
- +

Referenced by dmxBECreatePicture(), dmxBEFreePicture(), dmxChangePictureClip(), dmxComposite(), dmxCompositeRects(), dmxCreatePicture(), dmxCreatePictureList(), dmxDestroyPictureClip(), dmxProcRenderCompositeGlyphs(), dmxProcRenderSetPictureFilter(), dmxProcRenderSetPictureTransform(), dmxTrapezoids(), dmxTriangles(), dmxTriFan(), dmxTriStrip(), and dmxValidatePicture().

+ + + + +
+
+
- +
Mask _dmxPictPriv::savedMask + Mask _dmxPictPriv::savedMask
-
- - - - - -
-   - + +
+

Mask of picture attributes saved for lazy window creation.

-

-Mask of picture attributes saved for lazy window creation.

-

The documentation for this struct was generated from the following file: +

Referenced by dmxChangePicture(), dmxCreatePicture(), and dmxValidatePicture().

+ + + +
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html index a358c0162..67e50903e 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html @@ -6,18 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxPixPriv Struct Reference

#include <dmxpixmap.h> -

- - + + +
+

_dmxPixPriv Struct Reference

+

#include <dmxpixmap.h>

+
+ + +

Data Fields

Pixmap pixmap
XImage * detachedImage
-

Detailed Description

-Pixmap private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Pixmap private area.

+

Field Documentation

+ +
+
+ + + + +
XImage* _dmxPixPriv::detachedImage
+
+
+ +

Referenced by dmxBERestorePixmap(), dmxBESavePixmap(), dmxCreatePixmap(), and dmxDestroyPixmap().

+ +
+
+ +
+
+ + + + +
Pixmap _dmxPixPriv::pixmap
+
+
+ +

Referenced by dmxBECreatePixmap(), dmxBEFreePixmap(), dmxBERestorePixmap(), dmxBESavePixmap(), dmxBitmapToRegion(), dmxChangeGC(), dmxCreatePixmap(), dmxDoChangeWindowAttributes(), dmxDoCreatePicture(), and dmxFindAlternatePixmap().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html index c51978e8f..3601baa07 100644 --- a/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html +++ b/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html @@ -6,18 +6,180 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_dmxWinPriv Struct Reference

#include <dmxwindow.h> -

- - + + +
+

_dmxWinPriv Struct Reference

+

#include <dmxwindow.h>

+
+ + + + + + + + + +

Data Fields

Window window
Bool offscreen
Bool mapped
Bool restacked
unsigned long attribMask
Colormap cmap
Visual * visual
Bool isShaped
Bool hasPict
-

Detailed Description

-Window private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

Window private area.

+

Field Documentation

+ +
+
+ + + + +
unsigned long _dmxWinPriv::attribMask
+
+
+ +

Referenced by dmxChangeWindowAttributes(), dmxCreateNonRootWindow(), dmxCreateRootWindow(), and dmxCreateWindow().

+ +
+
+ +
+
+ + + + +
Colormap _dmxWinPriv::cmap
+
+
+ +

Referenced by dmxBECreateWindowTree(), dmxCreateNonRootWindow(), and dmxCreateWindow().

+ +
+
+ +
+
+ + + + +
Bool _dmxWinPriv::hasPict
+
+
+ +

Referenced by dmxCreateAndRealizeWindow(), dmxCreateWindow(), and dmxDoCreatePicture().

+ +
+
+ +
+
+ + + + +
Bool _dmxWinPriv::isShaped
+
+
+ +

Referenced by dmxCreateAndRealizeWindow(), dmxCreateWindow(), and dmxSetShape().

+ +
+
+ +
+
+ + + + +
Bool _dmxWinPriv::mapped
+
+
+ +

Referenced by dmxBECreateWindowTree(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateWindow(), dmxPositionWindow(), dmxRealizeWindow(), dmxResizeRootWindow(), dmxResizeWindow(), and dmxUnrealizeWindow().

+ +
+
+ +
+
+ + + + +
Bool _dmxWinPriv::offscreen
+
+
+ +

Referenced by dmxBECreateWindowTree(), dmxCopyWindow(), dmxCreateWindow(), dmxGetWindowAttributes(), dmxPositionWindow(), dmxRealizeWindow(), dmxResizeWindow(), and dmxUnrealizeWindow().

+ +
+
+ +
+
+ + + + +
Bool _dmxWinPriv::restacked
+
+
+ +

Referenced by dmxCreateAndRealizeWindow(), dmxCreateNonRootWindow(), dmxCreateWindow(), and dmxRestackWindow().

+ +
+
+ +
+
+ + + + +
Visual* _dmxWinPriv::visual
+
+
+ +

Referenced by dmxBECreateWindowTree(), dmxCreateNonRootWindow(), and dmxCreateWindow().

+ +
+
+ +
+
+ + + + +
Window _dmxWinPriv::window
+
+
+ +

Referenced by dmxBECreateWindowTree(), dmxBEDestroyWindow(), dmxChangeBorderWidth(), dmxChangeWindowAttributes(), dmxCopyWindow(), dmxCreateAndRealizeWindow(), dmxCreateNonRootWindow(), dmxCreateWindow(), dmxDoCreatePicture(), dmxDoRestackWindow(), dmxDoSetShape(), dmxForceWindowCreation(), dmxGetWindowAttributes(), dmxPositionWindow(), dmxRealizeWindow(), dmxReparentWindow(), dmxResizeRootWindow(), dmxResizeWindow(), dmxRestackWindow(), dmxSetShape(), dmxUnrealizeWindow(), and dmxWindowExposures().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/struct__myPrivate.html b/xorg-server/hw/dmx/doc/html/struct__myPrivate.html index 50e532569..2a3cb28e8 100644 --- a/xorg-server/hw/dmx/doc/html/struct__myPrivate.html +++ b/xorg-server/hw/dmx/doc/html/struct__myPrivate.html @@ -6,258 +6,1096 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

_myPrivate Struct Reference

- - - + + +
+

_myPrivate Struct Reference

+

#include <usb-private.h>

+

Data Fields

int fd
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Types

enum  {
+  button1 = 0x0001, +button2 = 0x0002, +button3 = 0x0004, +button4 = 0x0008, +
+  button5 = 0x0010 +
+ }
enum  {
+  button1 = 0x0001, +button2 = 0x0002, +button3 = 0x0004, +button4 = 0x0008, +
+  button5 = 0x0010 +
+ }

Data Fields

 DMX_COMMON_PRIVATE
int myScreen
DMXScreenInfo * grabbedScreen
int lastX
int lastY
int centerX
int centerY
int relative
int newscreen
int initialized
DevicePtr mou
DevicePtr kbd
int entered
int offX
int offY
int globalX
int globalY
int curX
int curY
int width
int height
int consWidth
int consHeight
double xScale
double yScale
XlibGC gc
XlibGC gcDet
XlibGC gcRev
XlibGC gcCur
int grabbed
int fine
int captured
Cursor cursorNormal
Cursor cursorGrabbed
Cursor cursorEmpty
Pixmap pixmap
CloseScreenProcPtr CloseScreen
struct _myPrivate * next
int fd
int vtno
int vtcurrent
int kbdtrans
struct termios kbdtty
int kbdType
CARD32 kbdState [NUM_STATE_ENTRIES]
DeviceIntPtr pKeyboard
unsigned char prefix
int switched
SWITCHRETPROC switch_return
void * switch_return_data
int pitch
unsigned long duration
DeviceIntPtr pMouse
struct termios tty
enum _myPrivate:: { ... }  buttons
enum _myPrivate:: { ... }  buttons
DeviceIntPtr pDevice
unsigned char mask [EV_MAX/8+1]
int numRel
int numAbs
int numLeds
int relmap [DMX_MAX_AXES]
int absmap [DMX_MAX_AXES]
DMXInputInfo * dmxInput
+

Detailed Description

+

Each device has a private area that is visible only from inside the driver code.

+

Member Enumeration Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + + +
button1  +
button2  +
button3  +
button4  +
button5  +
+
+
-
CARD32 kbdState [NUM_STATE_ENTRIES]
+ + + +
anonymous enum
+ +

+
Enumerator:
+ + + + + +
button1  +
button2  +
button3  +
button4  +
button5  +
+
+
-
int pitch
+ + + +
int _myPrivate::absmap[DMX_MAX_AXES]
+ +

+

Absolute axis map

-
unsigned long duration
+ + + +
enum { ... } _myPrivate::buttons
+ +

-
DeviceIntPtr pDevice
+ + + +
enum { ... } _myPrivate::buttons
+ +

-
unsigned char mask [EV_MAX/8+1]
+ + + +
int _myPrivate::captured
+ +

-
int numLeds
int relmap [DMX_MAX_AXES]
+ + + +
int _myPrivate::centerX
+ +

-
int absmap [DMX_MAX_AXES]
DMXInputInfo * dmxInput
+ + + +
int _myPrivate::centerY
+ +

-
-

Detailed Description

-Each device has a private area that is visible only from inside the driver code. -

-

Field Documentation

-

- - - - -
- - -
int _myPrivate::absmap[DMX_MAX_AXES] -
-
- - - - - -
-   - - -

-Absolute axis map

-

- - - - -
- +

Referenced by dmxBackendComputeCenter().

+ + + + +
+
+
- +
DMXInputInfo* _myPrivate::dmxInput + CloseScreenProcPtr _myPrivate::CloseScreen
-
- - - - - -
-   - - -

-For pretty-printing

-

- - - - -
- + +
+ +

Referenced by dmxCloseConsoleScreen(), and dmxConsoleInit().

+ +
+ + +
+
+
- +
unsigned long _myPrivate::duration + int _myPrivate::consHeight
-
- - - - - -
-   - - -

-Bell duration

-

- - - - -
- + +
+ +

Referenced by dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+ + +
+
+
- +
int _myPrivate::fd + int _myPrivate::consWidth
-
- - - - - -
-   - - -

-File descriptor

-

- - - - -
- + +
+ +

Referenced by dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+ + +
+
+
- +
CARD32 _myPrivate::kbdState + Cursor _myPrivate::cursorEmpty
-
- - - - - -
-   - - -

-Keyboard state

-

- - - - -
- + +
+ +
+ + +
+
+
- +
unsigned char _myPrivate::mask[EV_MAX/8 + 1] + Cursor _myPrivate::cursorGrabbed
-
- - - - - -
-   - - -

-Mask

-

- - - - -
- + +
+ +
+ + +
+
+
- +
int _myPrivate::numLeds + Cursor _myPrivate::cursorNormal
-
- - - - - -
-   - - -

-Counts

-

- - - - -
- + +
+ +
+ + +
+
+
- +
DeviceIntPtr _myPrivate::pDevice + int _myPrivate::curX
-
- - - - - -
-   - - -

-Device (mouse or other)

-

- - - - -
- + +
+ +

Referenced by dmxConsoleCapture(), and dmxConsoleMoveAbsolute().

+ +
+ + +
+
+
- +
int _myPrivate::pitch + int _myPrivate::curY
-
- - - - - -
-   - - -

-Bell pitch

-

- - - - -
- + +
+ +

Referenced by dmxConsoleCapture(), and dmxConsoleMoveAbsolute().

+ +
+ + +
+
+
- +
int _myPrivate::relmap[DMX_MAX_AXES] + _myPrivate::DMX_COMMON_PRIVATE
-
- - - - - -
-   - - -

-Relative axis map

-

The documentation for this struct was generated from the following files: + +
+ +
+ + +
+
+ + + + +
DMXInputInfo* _myPrivate::dmxInput
+
+
+

For pretty-printing

+ +

Referenced by dmxCloseConsole(), dmxConsoleCollectEvents(), dmxConsoleDraw(), dmxConsoleInit(), and dmxDump().

+ +
+
+ +
+
+ + + + +
unsigned long _myPrivate::duration
+
+
+

Bell duration

+ +
+
+ +
+
+ + + + +
int _myPrivate::entered
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::fd
+
+
+

File descriptor

+ +

Referenced by kbdLinuxCreatePrivate(), kbdLinuxVTSignalHandler(), kbdLinuxVTSwitch(), msLinuxCreatePrivate(), ps2LinuxCreatePrivate(), usbCreatePrivate(), and usbPrint().

+ +
+
+ +
+
+ + + + +
int _myPrivate::fine
+
+
+ +

Referenced by dmxConsoleCapture(), and dmxConsoleDraw().

+ +
+
+ +
+
+ + + + +
XlibGC _myPrivate::gc
+
+
+ +

Referenced by dmxBECreateCursor(), dmxCloseConsole(), dmxConsoleClearCursor(), dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
XlibGC _myPrivate::gcCur
+
+
+ +

Referenced by dmxCloseConsole(), and dmxConsoleDrawFineCursor().

+ +
+
+ +
+
+ + + + +
XlibGC _myPrivate::gcDet
+
+
+ +

Referenced by dmxCloseConsole(), dmxConsoleClearCursor(), and dmxConsoleDraw().

+ +
+
+ +
+
+ + + + +
XlibGC _myPrivate::gcRev
+
+
+ +

Referenced by dmxCloseConsole(), dmxConsoleClearCursor(), and dmxConsoleDraw().

+ +
+
+ +
+
+ + + + +
int _myPrivate::globalX
+
+
+ +

Referenced by dmxConsoleDrawFineCursor(), dmxConsoleUpdateFineCursor(), and dmxCursorOffScreen().

+ +
+
+ +
+
+ + + + +
int _myPrivate::globalY
+
+
+ +

Referenced by dmxConsoleDrawFineCursor(), dmxConsoleUpdateFineCursor(), and dmxCursorOffScreen().

+ +
+
+ +
+
+ + + + +
int _myPrivate::grabbed
+
+
+ +

Referenced by dmxConsoleDrawFineCursor().

+ +
+
+ +
+
+ + + + +
DMXScreenInfo* _myPrivate::grabbedScreen
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::height
+
+
+ +

Referenced by dmxConsoleCollectEvents(), dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
int _myPrivate::initialized
+
+
+ +
+
+ +
+
+ + + + +
DevicePtr _myPrivate::kbd
+
+
+ +
+
+ +
+
+ + + + +
CARD32 _myPrivate::kbdState
+
+
+

Keyboard state

+ +

Referenced by kbdLinuxKeyDown(), kbdLinuxKeyState(), kbdUSBKeyDown(), and kbdUSBKeyState().

+ +
+
+ +
+
+ + + + +
int _myPrivate::kbdtrans
+
+
+ +
+
+ +
+
+ + + + +
struct termios _myPrivate::kbdtty [read]
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::kbdType
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::lastX
+
+
+ +

Referenced by dmxConsoleMoveRelative(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
int _myPrivate::lastY
+
+
+ +

Referenced by dmxConsoleMoveRelative(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
unsigned char _myPrivate::mask[EV_MAX/8+1]
+
+
+

Mask

+ +

Referenced by dmxConsoleInit().

+ +
+
+ +
+
+ + + + +
DevicePtr _myPrivate::mou
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::myScreen
+
+
+ +

Referenced by dmxBackendFindOverlapping(), and dmxBackendSameDisplay().

+ +
+
+ +
+
+ + + + +
int _myPrivate::newscreen
+
+
+ +
+
+ +
+
+ + + + +
struct _myPrivate* _myPrivate::next [read]
+
+
+ +

Referenced by dmxCloseConsoleScreen().

+ +
+
+ +
+
+ + + + +
int _myPrivate::numAbs
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::numLeds
+
+
+

Counts

+ +
+
+ +
+
+ + + + +
int _myPrivate::numRel
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::offX
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::offY
+
+
+ +
+
+ +
+
+ + + + +
DeviceIntPtr _myPrivate::pDevice
+
+
+

Device (mouse or other)

+ +

Referenced by usbCreatePrivate(), and usbPrint().

+ +
+
+ +
+
+ + + + +
int _myPrivate::pitch
+
+
+

Keyboard device Bell pitch

+ +
+
+ +
+
+ + + + +
Pixmap _myPrivate::pixmap
+
+
+ +

Referenced by dmxConsoleCreateEmptyCursor(), dmxConsoleDraw(), dmxConsoleDrawFineCursor(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
DeviceIntPtr _myPrivate::pKeyboard
+
+
+ +

Referenced by kbdLinuxCreatePrivate().

+ +
+
+ +
+
+ + + + +
DeviceIntPtr _myPrivate::pMouse
+
+
+ +

Referenced by msLinuxCreatePrivate(), and ps2LinuxCreatePrivate().

+ +
+
+ +
+
+ + + + +
unsigned char _myPrivate::prefix
+
+
+ +

Referenced by kbdLinuxPrefixMapping().

+ +
+
+ +
+
+ + + + +
int _myPrivate::relative
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::relmap[DMX_MAX_AXES]
+
+
+

Relative axis map

+ +
+
+ +
+
+ + + + +
SWITCHRETPROC _myPrivate::switch_return
+
+
+ +

Referenced by kbdLinuxVTSignalHandler(), and kbdLinuxVTSwitch().

+ +
+
+ +
+
+ + + + +
void* _myPrivate::switch_return_data
+
+
+ +

Referenced by kbdLinuxVTSignalHandler(), and kbdLinuxVTSwitch().

+ +
+
+ +
+
+ + + + +
int _myPrivate::switched
+
+
+ +

Referenced by kbdLinuxVTSignalHandler(), and kbdLinuxVTSwitch().

+ +
+
+ +
+
+ + + + +
struct termios _myPrivate::tty [read]
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::vtcurrent
+
+
+ +
+
+ +
+
+ + + + +
int _myPrivate::vtno
+
+
+ +

Referenced by kbdLinuxVTSwitch().

+ +
+
+ +
+
+ + + + +
int _myPrivate::width
+
+
+ +

Referenced by dmxConsoleCollectEvents(), dmxConsoleDraw(), and dmxConsoleUpdateFineCursor().

+ +
+
+ +
+
+ + + + +
double _myPrivate::xScale
+
+
+ +

Referenced by scalex(), and unscalex().

+ +
+
+ +
+
+ + + + +
double _myPrivate::yScale
+
+
+ +

Referenced by scaley(), and unscaley().

+ +
+
+
The documentation for this struct was generated from the following files: +
diff --git a/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html b/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html index 2c5584e14..e431d597d 100644 --- a/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html +++ b/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html @@ -6,18 +6,68 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

dmxGlxVisualPrivate Struct Reference

#include <dmx_glxvisuals.h> -

- - + + +
+

dmxGlxVisualPrivate Struct Reference

+

#include <dmx_glxvisuals.h>

+
+ + +

Data Fields

int x_visual_depth
int x_visual_class
-

Detailed Description

-GLX Visual private area. -

-

The documentation for this struct was generated from the following file: +

Detailed Description

+

GLX Visual private area.

+

Field Documentation

+ +
+
+ + + + +
int dmxGlxVisualPrivate::x_visual_class
+
+
+ +

Referenced by InitOutput().

+ +
+
+ +
+
+ + + + +
int dmxGlxVisualPrivate::x_visual_depth
+
+
+ +

Referenced by InitOutput().

+ +
+
+
The documentation for this struct was generated from the following file: +
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html b/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html deleted file mode 100644 index 580d1dcc0..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXAddInputReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXAddInput protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html b/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html deleted file mode 100644 index 8f2a84d5d..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXAddInputReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXAddInput protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html b/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html deleted file mode 100644 index 6f1b91d8e..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXAddScreenReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXAddScreen protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html b/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html deleted file mode 100644 index ec634882d..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXAddScreenReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXAddScreen protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html deleted file mode 100644 index 5ca2fb174..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXChangeDesktopAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXChangeDesktopAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html deleted file mode 100644 index 9fb5c4cdf..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXChangeDesktopAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXChangeDesktopAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html deleted file mode 100644 index f7228665f..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXChangeScreensAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXChangeScreensAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html deleted file mode 100644 index d744c6a72..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXChangeScreensAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXChangeScreensAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html b/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html deleted file mode 100644 index 796791499..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXForceWindowCreationReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXForceWindowCreation protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html b/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html deleted file mode 100644 index b85f6b11c..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXForceWindowCreationReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXForceWindowCreation protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html deleted file mode 100644 index 6637fb12a..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetDesktopAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetDesktopAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html deleted file mode 100644 index c9ecbc38d..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetDesktopAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetDesktopAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html deleted file mode 100644 index 71595c5a1..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetInputAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetInputAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html deleted file mode 100644 index 6c7fade50..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetInputAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetInputAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html deleted file mode 100644 index 375b1415c..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetInputCountReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetInputCount protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html deleted file mode 100644 index 55251bb52..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetInputCountReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetInputCount protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html deleted file mode 100644 index 89ca021e7..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetScreenAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetScreenAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html deleted file mode 100644 index d7d9e9afd..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetScreenAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetScreenAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html deleted file mode 100644 index e694fc90a..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetScreenCountReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetScreenCount protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html deleted file mode 100644 index f27e1e05a..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetScreenCountReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetScreenCount protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html deleted file mode 100644 index 2e381958b..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetWindowAttributesReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetWindowAttributes protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html deleted file mode 100644 index 9b3e1c053..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXGetWindowAttributesReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXGetWindowAttributes protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html b/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html deleted file mode 100644 index c9a4683f1..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXQueryVersionReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXQueryVersion protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html b/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html deleted file mode 100644 index fdc3c3f97..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXQueryVersionReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXQueryVersion protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html deleted file mode 100644 index 66c04a373..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXRemoveInputReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXRemoveInput protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html deleted file mode 100644 index 62f2af182..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXRemoveInputReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXRemoveInput protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html deleted file mode 100644 index c446a3442..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXRemoveScreenReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXRemoveScreen protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html deleted file mode 100644 index 3920bff9b..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXRemoveScreenReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXRemoveScreen protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html b/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html deleted file mode 100644 index 0a361cf5d..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXSyncReply Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXSync protocol reply. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html b/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html deleted file mode 100644 index a1580095d..000000000 --- a/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

xDMXSyncReq Struct Reference

#include <dmxproto.h> -

- - -
-

Detailed Description

-Wire-level description of DMXSync protocol request. -

-

The documentation for this struct was generated from the following file: -
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/tree.html b/xorg-server/hw/dmx/doc/html/tree.html index 59560837e..d85f37403 100644 --- a/xorg-server/hw/dmx/doc/html/tree.html +++ b/xorg-server/hw/dmx/doc/html/tree.html @@ -1,70 +1,31 @@ + - + - + TreeView - - +
-

Distributed Multihead X

+

Distributed Multihead X

-

o*Main Page

-

o+File List

+

o*Main Page

+

o+Data Structures

-

|o*ChkNotMaskEv.c

-

|o*ChkNotMaskEv.h

-

|o*programs/Xserver/Xext/dmx.c

-

|o*lib/dmx/dmx.c

-

|o*dmx.h

-

|o*dmx_glxvisuals.h

-

|o*dmxarg.c

-

|o*dmxarg.h

-

|o*dmxbackend.c

-

|o*dmxbackend.h

-

|o*dmxcb.c

-

|o*dmxcb.h

-

|o*dmxclient.h

-

|o*dmxcmap.c

-

|o*dmxcmap.h

-

|o*dmxcommon.c

-

|o*dmxcommon.h

-

|o*dmxcompat.c

-

|o*dmxcompat.h

-

|o*dmxconfig.c

-

|o*dmxconfig.h

-

|o*dmxconsole.c

-

|o*dmxconsole.h

-

|o*dmxcursor.c

-

|o*dmxcursor.h

-

|o*dmxdetach.c

-

|o*dmxdpms.c

-

|o*dmxdpms.h

-

|o*dmxdummy.c

-

|o*dmxdummy.h

-

|o*dmxeq.c

-

|o*dmxeq.h

-

|o*dmxevents.c

-

|o*dmxevents.h

-

|o*dmxext.h

-

|o*dmxextension.c

-

|o*dmxextension.h

-

|o*dmxfont.c

-

|o*dmxfont.h

-

|o*dmxgc.c

-

|o*dmxgc.h

-

|o*dmxgcops.c

-

|o*dmxgcops.h

-

|o*dmxinit.c

-

|o*dmxinit.h

-

|o*dmxinput.c

-

|o*dmxinput.h

-

|o*dmxinputinit.c

-

|o*dmxinputinit.h

-

|o*dmxlog.c

-

|o*dmxlog.h

-

|o*dmxmap.c

-

|o*dmxmap.h

-

|o*dmxmotion.c

-

|o*dmxmotion.h

-

|o*dmxparse.c

-

|o*dmxparse.h

-

|o*dmxpict.c

-

|o*dmxpict.h

-

|o*dmxpixmap.c

-

|o*dmxpixmap.h

-

|o*dmxprint.c

-

|o*dmxprint.h

-

|o*dmxprop.c

-

|o*dmxprop.h

-

|o*dmxproto.h

-

|o*dmxscrinit.c

-

|o*dmxscrinit.h

-

|o*dmxshadow.c

-

|o*dmxshadow.h

-

|o*dmxsigio.c

-

|o*dmxsigio.h

-

|o*dmxstat.c

-

|o*dmxstat.h

-

|o*dmxsync.c

-

|o*dmxsync.h

-

|o*dmxvisual.c

-

|o*dmxvisual.h

-

|o*dmxwindow.c

-

|o*dmxwindow.h

-

|o*dmxxinput.c

-

|o*lnx-keyboard.c

-

|o*lnx-keyboard.h

-

|o*lnx-ms.c

-

|o*lnx-ms.h

-

|o*lnx-ps2.c

-

|o*lnx-ps2.h

-

|o*usb-common.c

-

|o*usb-common.h

-

|o*usb-keyboard.c

-

|o*usb-keyboard.h

-

|o*usb-mouse.c

-

|o*usb-mouse.h

-

|o*usb-other.c

-

|o*usb-other.h

-

|\*usb-private.h

+

|o*_dmxArg

+

|o*_dmxColormapPriv

+

|o*_DMXConfigComment

+

|o*_DMXConfigDisplay

+

|o*_DMXConfigEntry

+

|o*_DMXConfigFullDim

+

|o*_DMXConfigNumber

+

|o*_DMXConfigOption

+

|o*_DMXConfigPair

+

|o*_DMXConfigParam

+

|o*_DMXConfigPartDim

+

|o*_DMXConfigString

+

|o*_DMXConfigSub

+

|o*_DMXConfigToken

+

|o*_DMXConfigVirtual

+

|o*_DMXConfigWall

+

|o*_dmxCursorPriv

+

|o*_DMXEventMap

+

|o*_dmxFontPriv

+

|o*_dmxGCPriv

+

|o*_dmxGlyphPriv

+

|o*_DMXInputInfo

+

|o*_DMXLocalInitInfo

+

|o*_DMXLocalInputInfo

+

|o*_dmxPictPriv

+

|o*_dmxPixPriv

+

|o*_DMXScreenInfo

+

|o*_DMXStatAvg

+

|o*_DMXStatInfo

+

|o*_dmxWinPriv

+

|o*_myPrivate

+

|o*DMXConfigCmdStruct

+

|o*DMXConfigListStruct

+

|o*DMXDesktopAttributesRec

+

|o*dmxGlxVisualPrivate

+

|o*DMXInputAttributesRec

+

|o*DMXScreenAttributesRec

+

|o*DMXWindowAttributesRec

+

|\*stack

-

o+Data Structures

+

o*Data Fields

+

o+File List

-

|o*_dmxArg

-

|o*_dmxColormapPriv

-

|o*_DMXConfigComment

-

|o*_DMXConfigDisplay

-

|o*_DMXConfigEntry

-

|o*_DMXConfigFullDim

-

|o*_DMXConfigNumber

-

|o*_DMXConfigOption

-

|o*_DMXConfigPair

-

|o*_DMXConfigParam

-

|o*_DMXConfigPartDim

-

|o*_DMXConfigString

-

|o*_DMXConfigSub

-

|o*_DMXConfigToken

-

|o*_DMXConfigVirtual

-

|o*_DMXConfigWall

-

|o*_dmxCursorPriv

-

|o*_DMXEventMap

-

|o*_dmxFontPriv

-

|o*_dmxGCPriv

-

|o*_dmxGlyphPriv

-

|o*_DMXInputInfo

-

|o*_DMXLocalInitInfo

-

|o*_DMXLocalInputInfo

-

|o*_dmxPictPriv

-

|o*_dmxPixPriv

-

|o*_DMXScreenInfo

-

|o*_DMXStatAvg

-

|o*_DMXStatInfo

-

|o*_dmxWinPriv

-

|o*_Event

-

|o*_EventQueue

-

|o*_myPrivate

-

|o*DMXConfigCmdStruct

-

|o*DMXConfigListStruct

-

|o*DMXDesktopAttributes

-

|o*DMXDesktopAttributesRec

-

|o*dmxGlxVisualPrivate

-

|o*DMXInputAttributes

-

|o*DMXInputAttributesRec

-

|o*DMXScreenAttributes

-

|o*DMXScreenAttributesRec

-

|o*DMXWindowAttributes

-

|o*DMXWindowAttributesRec

-

|o*xDMXAddInputReply

-

|o*xDMXAddInputReq

-

|o*xDMXAddScreenReply

-

|o*xDMXAddScreenReq

-

|o*xDMXChangeDesktopAttributesReply

-

|o*xDMXChangeDesktopAttributesReq

-

|o*xDMXChangeScreensAttributesReply

-

|o*xDMXChangeScreensAttributesReq

-

|o*xDMXForceWindowCreationReply

-

|o*xDMXForceWindowCreationReq

-

|o*xDMXGetDesktopAttributesReply

-

|o*xDMXGetDesktopAttributesReq

-

|o*xDMXGetInputAttributesReply

-

|o*xDMXGetInputAttributesReq

-

|o*xDMXGetInputCountReply

-

|o*xDMXGetInputCountReq

-

|o*xDMXGetScreenAttributesReply

-

|o*xDMXGetScreenAttributesReq

-

|o*xDMXGetScreenCountReply

-

|o*xDMXGetScreenCountReq

-

|o*xDMXGetWindowAttributesReply

-

|o*xDMXGetWindowAttributesReq

-

|o*xDMXQueryVersionReply

-

|o*xDMXQueryVersionReq

-

|o*xDMXRemoveInputReply

-

|o*xDMXRemoveInputReq

-

|o*xDMXRemoveScreenReply

-

|o*xDMXRemoveScreenReq

-

|o*xDMXSyncReply

-

|\*xDMXSyncReq

+

|o*ChkNotMaskEv.c

+

|o*ChkNotMaskEv.h

+

|o*dmx-config.h

+

|o*dmx.c

+

|o*dmx.h

+

|o*dmx_glxvisuals.c

+

|o*dmx_glxvisuals.h

+

|o*dmxarg.c

+

|o*dmxarg.h

+

|o*dmxbackend.c

+

|o*dmxbackend.h

+

|o*dmxcb.c

+

|o*dmxcb.h

+

|o*dmxclient.h

+

|o*dmxcmap.c

+

|o*dmxcmap.h

+

|o*dmxcommon.c

+

|o*dmxcommon.h

+

|o*dmxcompat.c

+

|o*dmxcompat.h

+

|o*dmxconfig.c

+

|o*dmxconfig.h

+

|o*dmxconsole.c

+

|o*dmxconsole.h

+

|o*dmxcursor.c

+

|o*dmxcursor.h

+

|o*dmxdetach.c

+

|o*dmxdpms.c

+

|o*dmxdpms.h

+

|o*dmxdummy.c

+

|o*dmxdummy.h

+

|o*dmxevents.c

+

|o*dmxevents.h

+

|o*dmxextension.c

+

|o*dmxextension.h

+

|o*dmxfont.c

+

|o*dmxfont.h

+

|o*dmxgc.c

+

|o*dmxgc.h

+

|o*dmxgcops.c

+

|o*dmxgcops.h

+

|o*dmxinit.c

+

|o*dmxinit.h

+

|o*dmxinput.c

+

|o*dmxinput.h

+

|o*dmxinputinit.c

+

|o*dmxinputinit.h

+

|o*dmxlog.c

+

|o*dmxlog.h

+

|o*dmxmap.c

+

|o*dmxmap.h

+

|o*dmxmotion.c

+

|o*dmxmotion.h

+

|o*dmxparse.c

+

|o*dmxparse.h

+

|o*dmxpict.c

+

|o*dmxpict.h

+

|o*dmxpixmap.c

+

|o*dmxpixmap.h

+

|o*dmxprint.c

+

|o*dmxprint.h

+

|o*dmxprop.c

+

|o*dmxprop.h

+

|o*dmxscrinit.c

+

|o*dmxscrinit.h

+

|o*dmxshadow.c

+

|o*dmxshadow.h

+

|o*dmxsigio.c

+

|o*dmxsigio.h

+

|o*dmxstat.c

+

|o*dmxstat.h

+

|o*dmxsync.c

+

|o*dmxsync.h

+

|o*dmxtodmx.c

+

|o*dmxvisual.c

+

|o*dmxvisual.h

+

|o*dmxwindow.c

+

|o*dmxwindow.h

+

|o*dmxxinput.c

+

|o*lnx-keyboard.c

+

|o*lnx-keyboard.h

+

|o*lnx-ms.c

+

|o*lnx-ms.h

+

|o*lnx-ps2.c

+

|o*lnx-ps2.h

+

|o*usb-common.c

+

|o*usb-common.h

+

|o*usb-keyboard.c

+

|o*usb-keyboard.h

+

|o*usb-mouse.c

+

|o*usb-mouse.h

+

|o*usb-other.c

+

|o*usb-other.h

+

|o*usb-private.h

+

|o*vdltodmx.c

+

|\*xdmxconfig.c

-

o*Data Fields

-

\*Globals

+

\*Globals

+ diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8c.html b/xorg-server/hw/dmx/doc/html/usb-common_8c.html index 3c1882a5b..0032cf4eb 100644 --- a/xorg-server/hw/dmx/doc/html/usb-common_8c.html +++ b/xorg-server/hw/dmx/doc/html/usb-common_8c.html @@ -6,208 +6,718 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-common.c File Reference

#include "usb-private.h"
-#include "usb-mouse.h"
- - - - + + +
+

usb-common.c File Reference

#include "usb-private.h"
+#include "usb-mouse.h"
+

Functions

void usbRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define USB_COMMON_DEBUG   1
#define GETPRIV
#define GETNAME
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define LOG1INPUT(p, f, a)   dmxLogInput(p->dmxInput,f,a)
#define LOG3INPUT(p, f, a, b, c)   dmxLogInput(p->dmxInput,f,a,b,c)
#define LOG5INPUT(p, f, a, b, c, d, e)   dmxLogInput(p->dmxInput,f,a,b,c,d,e)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType
#define PRESS(b)
#define RELEASE(b)
#define test_bit(bit)   (priv->mask[(bit)/8] & (1 << ((bit)%8)))
#define test_bits(bit)   (bits[(bit)/8] & (1 << ((bit)%8)))

Functions

void usbRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)
static void usbPrint (myPrivate *priv, const char *filename, const char *devname, int fd)
void usbInit (DevicePtr pDev, usbType type)
void usbOff (DevicePtr pDev)
pointer usbCreatePrivate (DeviceIntPtr pDevice)
void usbDestroyPrivate (pointer priv)
+

Detailed Description

+

Routines that are common between usb-keyboard.c, usb-mouse.c, and usb-other.c

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-
void usbInit (DevicePtr pDev, usbType type)
+ + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+

+
-void usbOff (DevicePtr pDev) +
+ + +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-pointer usbCreatePrivate (DeviceIntPtr pDevice) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
-void usbDestroyPrivate (pointer priv) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+
+
- -

Detailed Description

-Routines that are common between #usb-keyboard.c, #usb-mouse.c, and #usb-other.c

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - - - + + + + + + + + + + + + + + + + +
pointer usbCreatePrivate ( DeviceIntPtr  pDevice  ) #define FATAL2(f,
a,
b  )    dmxLog(dmxFatal,f,a,b)
+ +
+
+ + +
+
+ + + +
#define GETNAME
-
- - - - - -
-   - - -

-Create a private structure for use within this file.

-

- - - - -
- + +
+Value:
((DMXLocalInputInfoPtr)(pDevice->public.devicePrivate)) \
+                      ->name
+
+

Referenced by usbPrint().

+ +
+ + +
+
+
+ + + +
#define GETPRIV
+ +
+Value:
myPrivate *priv                                         \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+ + +
+
+ - - - - - - + + + + + + +
void usbDestroyPrivate ( pointer  priv  ) #define LOG0(f  )    dmxLog(dmxDebug,f)
+
+
+
+
+ +
+
+ + + + + + + + + + + + + +
#define LOG1(f,
a  )    dmxLog(dmxDebug,f,a)
-
- - - - - -
-   - - -

-Destroy a private structure.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + - - - - + + + + + + + + + +
#define LOG1INPUT(p,
void usbInit ( DevicePtr  pDev, f,
a  )    dmxLogInput(p->dmxInput,f,a)
+ +
+ +

Referenced by usbPrint().

+ +
+ + +
+
+ + + + + + + + - - + + - - + + + + +
#define LOG2(f,
usbType  typea,
) b  )    dmxLog(dmxDebug,f,a,b)
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
#define LOG3(f,
a,
b,
c  )    dmxLog(dmxDebug,f,a,b,c)
-
- - - - - -
-   - - -

-Initialized pDev as a usbMouse, usbKeyboard, or usbOther device.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define LOG3INPUT(p,
f,
a,
b,
c  )    dmxLogInput(p->dmxInput,f,a,b,c)
+ +
+ +

Referenced by usbPrint().

+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + +
#define LOG5INPUT(p,
f,
a,
b,
c,
void usbOff ( DevicePtr  pDev  ) d,
e  )    dmxLogInput(p->dmxInput,f,a,b,c,d,e)
+
+
+

Referenced by usbPrint().

+ +
+
+ +
+
+ + + +
#define MOTIONPROC   dmxMotionProcPtr
-
- - - - - -
-   - - -

-Turn pDev off (i.e., stop taking input from pDev).

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - + + + + + + +
void usbRead ( DevicePtr  pDev, #define PRESS(b  ) 
+ +
+Value:
do {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } while (0)
+
+
+ + +
+
+ + + + + + + +
#define RELEASE(b  ) 
+
+
+Value:
do {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } while (0)
+
+
+
+ +
+
+ + + + + + + + + +
#define test_bit(bit  )    (priv->mask[(bit)/8] & (1 << ((bit)%8)))
+
+
+ +

Referenced by othUSBGetInfo(), usbInit(), and usbPrint().

+ +
+
+ +
+
+ + + + + + + + + +
#define test_bits(bit  )    (bits[(bit)/8] & (1 << ((bit)%8)))
+
+
+ +

Referenced by usbInit(), and usbPrint().

+ +
+
+ +
+
+ + + + +
#define USB_COMMON_DEBUG   1
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + +
pointer usbCreatePrivate (DeviceIntPtr  pDevice ) 
+
+
+

Create a private structure for use within this file.

+ +

References _myPrivate::fd, and _myPrivate::pDevice.

+ +
+
+ +
+
+ + + + + + + - - + +
void usbDestroyPrivate (pointer  priv )  MOTIONPROC  motion,
+
+
+

Destroy a private structure.

+ +
+
+ +
+
+ + + + + + + + + + + - - + + +
void usbInit (DevicePtr  pDev,
usbType  type 
ENQUEUEPROC  enqueue, )
+
+
+

Initialized pDev as a usbMouse, usbKeyboard, or usbOther device.

+ +

References FATAL1, GETPRIV, O_NONBLOCK, test_bit, test_bits, usbKeyboard, usbMouse, usbOther, and usbPrint().

+ +

Referenced by kbdUSBInit(), mouUSBInit(), and othUSBInit().

+ +
+
+ +
+
+ + + + + + + +
void usbOff (DevicePtr  pDev ) 
+
+
+

Turn pDev off (i.e., stop taking input from pDev).

+ +

References GETPRIV.

+ +
+
+ +
+
+ + + + + + + + + - - + + + + + + + + - - + + - - + + +
static void usbPrint (myPrivate *  priv,
int  minButton, const char *  filename,
const char *  devname,
BLOCK  blockint  fd 
) ) [static]
+
+
+ +

References ABS_BRAKE, ABS_GAS, ABS_WHEEL, EV_FF, EV_MSC, _myPrivate::fd, GETNAME, LED_MISC, LED_MUTE, LED_SLEEP, LED_SUSPEND, LOG1INPUT, LOG3INPUT, LOG5INPUT, _myPrivate::pDevice, test_bit, and test_bits.

+ +

Referenced by usbInit().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void usbRead (DevicePtr  pDev,
MOTIONPROC  motion,
ENQUEUEPROC  enqueue,
int  minButton,
BLOCK  block 
)
-
- - - - - -
-   - - -

-Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

-Since USB devices return EV_KEY events for buttons and keys, minButton is used to decide if a Button or Key event should be queued.

+

+
+

Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+

Since USB devices return EV_KEY events for buttons and keys, minButton is used to decide if a Button or Key event should be queued.

+ +

References DMX_ABSOLUTE, DMX_MAX_AXES, DMX_RELATIVE, GETPRIV, LOG3, PRESS, and RELEASE.

+ +

Referenced by mouUSBRead(), and othUSBRead().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html deleted file mode 100644 index 422ce1ff7..000000000 --- a/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-common.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00039 #ifndef _USB_COMMON_H_
-00040 #define _USB_COMMON_H_
-00041 typedef enum {
-00042     usbMouse,
-00043     usbKeyboard,
-00044     usbOther
-00045 } usbType;
-00046 
-00047 extern pointer usbCreatePrivate(DeviceIntPtr pDevice);
-00048 extern void    usbDestroyPrivate(pointer priv);
-00049 extern void    usbRead(DevicePtr pDev,
-00050                        dmxMotionProcPtr motion,
-00051                        dmxEnqueueProcPtr enqueue,
-00052                        int minButton,
-00053                        DMXBlockType block);
-00054 extern void    usbInit(DevicePtr pDev, usbType type);
-00055 extern void    usbOff(DevicePtr pDev);
-00056 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h.html b/xorg-server/hw/dmx/doc/html/usb-common_8h.html index 846695551..6fb3ff95e 100644 --- a/xorg-server/hw/dmx/doc/html/usb-common_8h.html +++ b/xorg-server/hw/dmx/doc/html/usb-common_8h.html @@ -6,153 +6,211 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

usb-common.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - +

Go to the source code of this file.

+

Functions

pointer usbCreatePrivate (DeviceIntPtr pDevice)
void usbDestroyPrivate (pointer priv)
void usbInit (DevicePtr pDev, usbType type)
void usbOff (DevicePtr pDev)
+ + + + + + + +

Enumerations

enum  usbType { usbMouse, +usbKeyboard, +usbOther + }

Functions

pointer usbCreatePrivate (DeviceIntPtr pDevice)
void usbDestroyPrivate (pointer priv)
void usbRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, int minButton, DMXBlockType block)
void usbInit (DevicePtr pDev, usbType type)
void usbOff (DevicePtr pDev)
-

Detailed Description

-Interface to common USB support.
See also:
usb-common.c

-usb-mouse.c

-usb-keyboard.c

-usb-other.c

-

Function Documentation

-

- - - - + +
+
Enumerator:
- +

Detailed Description

+

Interface to common USB support.

+
See also:
usb-common.c
+
+usb-mouse.c
+
+usb-keyboard.c
+
+usb-other.c
+

Enumeration Type Documentation

+ +
+
+
- - - - - - + -
pointer usbCreatePrivate ( DeviceIntPtr  pDevice  ) enum usbType
-
+ + +
usbMouse  +
usbKeyboard  +
usbOther  +
- - - - - -
-   - + + -

-Create a private structure for use within this file.

-

- - - - -
- + + +

Function Documentation

+ +
+
+
- - - - - - + + + + + + +
void usbDestroyPrivate ( pointer  priv  ) pointer usbCreatePrivate (DeviceIntPtr  pDevice ) 
+ +
+

Create a private structure for use within this file.

+ +

References _myPrivate::fd, and _myPrivate::pDevice.

+
+ + +
+
+ + + + + + + + +
void usbDestroyPrivate (pointer  priv ) 
-
- - - - - -
-   - + +
+

Destroy a private structure.

-

-Destroy a private structure.

-

- - - - -
- + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void usbInit ( DevicePtr  pDev, void usbInit (DevicePtr  pDev,
usbType  typeusbType  type 
) )
-
- - - - - -
-   - + +
+

Initialized pDev as a usbMouse, usbKeyboard, or usbOther device.

-

-Initialized pDev as a usbMouse, usbKeyboard, or usbOther device.

-

- - - - -
- +

References FATAL1, GETPRIV, O_NONBLOCK, test_bit, test_bits, usbKeyboard, usbMouse, usbOther, and usbPrint().

+ +

Referenced by kbdUSBInit(), mouUSBInit(), and othUSBInit().

+ + + + +
+
+
- - - - - - + + + + + + +
void usbOff ( DevicePtr  pDev  ) void usbOff (DevicePtr  pDev ) 
+ +
+

Turn pDev off (i.e., stop taking input from pDev).

+ +

References GETPRIV.

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void usbRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
int  minButton,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Turn pDev off (i.e., stop taking input from pDev).

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html new file mode 100644 index 000000000..722e849b1 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html @@ -0,0 +1,87 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html index 5da5a0b3b..6ef084811 100644 --- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html +++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html @@ -6,217 +6,703 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-keyboard.c File Reference

#include "atKeynames.h"
-#include "usb-private.h"
-#include "usb-keyboard.h"
- - - - + + +
+

usb-keyboard.c File Reference

#include "atKeynames.h"
+#include "usb-private.h"
+#include "usb-keyboard.h"
+#include <xkbsrv.h>
+

Functions

void kbdUSBCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Defines

#define USB_KEYBOARD_DEBUG   0
#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType
#define GLYPHS_PER_KEY   4
#define NUM_KEYCODES   248
#define MIN_KEYCODE   8
#define MAX_KEYCODE   (NUM_KEYCODES + MIN_KEYCODE - 1)

Functions

static int kbdUSBKeyDown (myPrivate *priv, int keyCode)
static void kbdUSBKeyState (myPrivate *priv, int type, int keyCode)
void kbdUSBCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
void kbdUSBInit (DevicePtr pDev)
static void kbdUSBConvert (DevicePtr pDev, unsigned int scanCode, int value, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void kbdUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
int kbdUSBOn (DevicePtr pDev)
static void kbdUSBGetMap (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
void kbdUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)

Variables

static KeySym map [NUM_KEYCODES *GLYPHS_PER_KEY]
+

Detailed Description

+

This code implements a low-level device driver for a USB keyboard under Linux. The keymap description is derived from code by Thomas Roell, Orest Zborowski.

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-void kbdUSBInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+
+
-void kbdUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block) +
+
+ +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-int kbdUSBOn (DevicePtr pDev) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
-void kbdUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + + + + + + +
#define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+
+
- -

Detailed Description

-This code implements a low-level device driver for a USB keyboard under Linux. The keymap description is derived from code by Thomas Roell, Orest Zborowski.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + + + + - - + + + + + +
void kbdUSBCtrl ( DevicePtr  pDev, #define FATAL2(f,
a,
KeybdCtrl *  ctrlb  )    dmxLog(dmxFatal,f,a,b)
+ +
+ +
+ + +
+
+ + + + +
#define GETPRIV
+
+
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+
+ +
+
+ + + + +
#define GLYPHS_PER_KEY   4
+
+
+ +

Referenced by kbdLinuxGetMap(), kbdLinuxReadKernelMapping(), and kbdUSBGetMap().

+ +
+
+ +
+
+ + + + + + + + + +
#define LOG0(f  )    dmxLog(dmxDebug,f)
+
+
+ +
+
+ +
+
+ + + + + + - - + + + + +
#define LOG1(f,
) a  )    dmxLog(dmxDebug,f,a)
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
#define LOG2(f,
a,
b  )    dmxLog(dmxDebug,f,a,b)
-
- - - - - -
-   - - -

-Set the LEDs.

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - + + + + + + + + - - + + - - + + + + +
void kbdUSBGetInfo ( DevicePtr  pDev, #define LOG3(f,
a,
DMXLocalInitInfoPtr  infob,
) c  )    dmxLog(dmxDebug,f,a,b,c)
+ +
+
+ + +
+
+ + + +
#define MAX_KEYCODE   (NUM_KEYCODES + MIN_KEYCODE - 1)
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+ +

Referenced by kbdLinuxGetMap(), and kbdUSBGetMap().

+ +
+ + +
+
+
- - - - - - + +
void kbdUSBInit ( DevicePtr  pDev  ) #define MIN_KEYCODE   8
+ +
+ +

Referenced by kbdLinuxConvert(), kbdLinuxGetMap(), kbdUSBConvert(), and kbdUSBGetMap().

+
+ + +
+
+ + + +
#define MOTIONPROC   dmxMotionProcPtr
-
- - - - - -
-   - - -

-Initialize pDev using usbInit.

-

- - - - -
- + +
+ +
+ + +
+
+
- - - - - - + +
int kbdUSBOn ( DevicePtr  pDev  ) #define NUM_KEYCODES   248
+ +
+

Referenced by kbdLinuxGetMap(), and kbdUSBGetMap().

+ +
+ + +
+
+ + + +
#define USB_KEYBOARD_DEBUG   0
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+ +
+ +

Function Documentation

+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void kbdUSBConvert (DevicePtr  pDev,
unsigned int  scanCode,
int  value,
ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
BLOCK  block 
) [static]
+ +
+ +

References GETPRIV, kbdLinuxKeyDown(), kbdUSBKeyDown(), kbdUSBKeyState(), and MIN_KEYCODE.

+ +

Referenced by kbdUSBRead().

+ +
+ + +
+
+ - - - - + + + + + + + + + - - + + + +
void kbdUSBRead ( DevicePtr  pDev, void kbdUSBCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrl 
MOTIONPROC  motion, )
+
+
+

Set the LEDs.

+ +

References GETPRIV.

+ +
+
+ +
+
+ + + + + + + + + + + - - + + +
void kbdUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
ENQUEUEPROC  enqueue, )
+
+
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::force, _DMXLocalInitInfo::kbdFeedbackClass, kbdUSBGetMap(), _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::modMap, and _DMXLocalInitInfo::names.

+ +
+
+ +
+
+ + + + + + + + + + + + + - - + + + + + +
static void kbdUSBGetMap (DevicePtr  pDev,
KeySymsPtr  pKeySyms,
CHECKPROC  checkspecial, CARD8 *  pModMap 
) [static]
+
+
+ +

References GLYPHS_PER_KEY, map, MAX_KEYCODE, MIN_KEYCODE, and NUM_KEYCODES.

+ +

Referenced by kbdUSBGetInfo().

+ +
+
+ +
+
+ + + + + + + + + +
void kbdUSBInit (DevicePtr  pDev ) 
+
+
+

Initialize pDev using usbInit.

+ +

References usbInit(), and usbKeyboard.

+ +

Referenced by kbdUSBOn().

+ +
+
+ +
+
+ + + + + + + + + - - + + - - + + +
static int kbdUSBKeyDown (myPrivate *  priv,
BLOCK  blockint  keyCode 
) ) [static]
+
+
+

References _myPrivate::kbdState, and NUM_STATE_ENTRIES.

+ +

Referenced by kbdUSBConvert().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
static void kbdUSBKeyState (myPrivate *  priv,
int  type,
int  keyCode 
) [static]
-
- - - - - -
-   - - -

-Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+

+
+ +

References _myPrivate::kbdState, and NUM_STATE_ENTRIES.

+ +

Referenced by kbdUSBConvert().

+ +
+
+ +
+
+ + + + + + + + + +
int kbdUSBOn (DevicePtr  pDev ) 
+
+
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and kbdUSBInit().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void kbdUSBRead (DevicePtr  pDev,
MOTIONPROC  motion,
ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
BLOCK  block 
)
+
+
+

Read an event from the pDev device. If the event is a motion event, enqueue it with the motion function. Otherwise, check for special keys with the checkspecial function and enqueue the event with the enqueue function. The block type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.

+ +

References GETPRIV, kbdUSBConvert(), and LOG3.

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
KeySym map[NUM_KEYCODES *GLYPHS_PER_KEY] [static]
+
+
+ +

Referenced by kbdLinuxGetMap(), kbdLinuxReadKernelMapping(), and kbdUSBGetMap().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html deleted file mode 100644 index 1f03b2483..000000000 --- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-keyboard.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _USB_KEYBOARD_H_
-00039 #define _USB_KEYBOARD_H_
-00040 extern void    kbdUSBInit(DevicePtr pDev);
-00041 extern void    kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00042 extern int     kbdUSBOn(DevicePtr pDev);
-00043 extern void    kbdUSBRead(DevicePtr pDev,
-00044                           dmxMotionProcPtr motion,
-00045                           dmxEnqueueProcPtr enqueue,
-00046                           dmxCheckSpecialProcPtr checkspecial,
-00047                           DMXBlockType block);
-00048 extern void    kbdUSBCtrl(DevicePtr pDev, KeybdCtrl *ctrl);
-00049 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html index 23f48a73a..988ee18cb 100644 --- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html +++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html @@ -6,160 +6,189 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

usb-keyboard.h File Reference

-

-Go to the source code of this file. - - - - - - - - - - +

Go to the source code of this file.

+

Functions

void kbdUSBInit (DevicePtr pDev)
void kbdUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int kbdUSBOn (DevicePtr pDev)
void kbdUSBCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
+ + + + + +

Functions

void kbdUSBInit (DevicePtr pDev)
void kbdUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int kbdUSBOn (DevicePtr pDev)
void kbdUSBRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void kbdUSBCtrl (DevicePtr pDev, KeybdCtrl *ctrl)
-

Detailed Description

-Interface to USB keyboard driver.
See also:
usb-keyboard.c

-usb-common.c

-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to USB keyboard driver.

+
See also:
usb-keyboard.c
+
+usb-common.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void kbdUSBCtrl ( DevicePtr  pDev, void kbdUSBCtrl (DevicePtr  pDev,
KeybdCtrl *  ctrlKeybdCtrl *  ctrl 
) )
-
- - - - - -
-   - + +
+

Set the LEDs.

-

-Set the LEDs.

-

- - - - -
- +

References GETPRIV.

+ + + + +
+
+
- - - - + + + + + - - - + + - - + + -
void kbdUSBGetInfo ( DevicePtr  pDev, void kbdUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoDMXLocalInitInfoPtr  info 
) )
-
- - - - - -
-   - + +
+

Fill the info structure with information needed to initialize pDev.

-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- +

References _DMXLocalInitInfo::focusClass, _DMXLocalInitInfo::force, _DMXLocalInitInfo::kbdFeedbackClass, kbdUSBGetMap(), _DMXLocalInitInfo::keyboard, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::modMap, and _DMXLocalInitInfo::names.

+ + + + +
+
+
- - - - - - + + + + + + -
void kbdUSBInit ( DevicePtr  pDev  ) void kbdUSBInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize pDev using usbInit.

-

-Initialize pDev using usbInit.

-

- - - - -
- +

References usbInit(), and usbKeyboard.

+ +

Referenced by kbdUSBOn().

+ + + + +
+
+
- - - - - - + + + + + + +
int kbdUSBOn ( DevicePtr  pDev  ) int kbdUSBOn (DevicePtr  pDev ) 
+ +
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and kbdUSBInit().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void kbdUSBRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Turn pDev on (i.e., take input from pDev).

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html new file mode 100644 index 000000000..ae2519d2b --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html @@ -0,0 +1,81 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html index ea3767d19..956624145 100644 --- a/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html +++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html @@ -6,176 +6,446 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-mouse.c File Reference

#include "usb-private.h"
-#include "usb-mouse.h"
- - - - + + +
+

usb-mouse.c File Reference

#include "usb-private.h"
+#include "usb-mouse.h"
+

Functions

void mouUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+ + + + + + + + + + + + + + + + + + + +

Defines

#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType

Functions

void mouUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void mouUSBInit (DevicePtr pDev)
int mouUSBOn (DevicePtr pDev)
static void mouUSBGetMap (DevicePtr pDev, unsigned char *map, int *nButtons)
void mouUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+

Detailed Description

+

This code implements a low-level device driver for a USB mouse.

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-void mouUSBInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+
+
-int mouUSBOn (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-void mouUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
- -

Detailed Description

-This code implements a low-level device driver for a USB mouse.

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + + + + + +
void mouUSBGetInfo ( DevicePtr  pDev, #define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+ +
+ +
+ + +
+
+ + + + + + + + - - + + - - + + + + +
#define FATAL2(f,
DMXLocalInitInfoPtr  infoa,
) b  )    dmxLog(dmxFatal,f,a,b)
+
+
+
+
+ +
+
+ + + +
#define GETPRIV
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+ + +
+
+
- - - - - - + + + + + + -
void mouUSBInit ( DevicePtr  pDev  ) #define LOG0(f  )    dmxLog(dmxDebug,f)
-
- - - - - -
-   - - -

-Initialize pDev using usbInit.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + - - - - - - + + + + + + +
#define LOG1(f,
int mouUSBOn ( DevicePtr  pDev  ) a  )    dmxLog(dmxDebug,f,a)
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + +
#define LOG2(f,
a,
b  )    dmxLog(dmxDebug,f,a,b)
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + - - - - + + + + + + + + - - + + + + +
#define LOG3(f,
void mouUSBRead ( DevicePtr  pDev, a,
b,
MOTIONPROC  motion, c  )    dmxLog(dmxDebug,f,a,b,c)
+ +
+ +
+ + +
+
+ + + +
#define MOTIONPROC   dmxMotionProcPtr
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + - - + + +
void mouUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
ENQUEUEPROC  enqueue, )
+
+
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, mouUSBGetMap(), _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+
+ +
+
+ + + + + + + + + + + + + - - + + + + + +
static void mouUSBGetMap (DevicePtr  pDev,
unsigned char *  map,
CHECKPROC  checkspecial, int *  nButtons 
) [static]
+
+
+ +

Referenced by mouUSBGetInfo().

+ +
+
+ +
+
+ + + + + + + - - +
void mouUSBInit (DevicePtr  pDev )  BLOCK  block
+
+
+

Initialize pDev using usbInit.

+ +

References usbInit(), and usbMouse.

+ +

Referenced by mouUSBOn().

+ +
+
+ +
+
+ + + + + + - - +
int mouUSBOn (DevicePtr  pDev )  ) 
+
+
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and mouUSBInit().

+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void mouUSBRead (DevicePtr  pDev,
MOTIONPROC  motion,
ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
BLOCK  block 
)
-
- - - - - -
-   - - -

-Read the USB device using usbRead.

+

+
+

Read the USB device using usbRead.

+ +

References usbRead().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html deleted file mode 100644 index 12fbbcd52..000000000 --- a/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-mouse.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _USB_MOU_H_
-00039 #define _USB_MOU_H_
-00040 extern void    mouUSBRead(DevicePtr pDev,
-00041                           dmxMotionProcPtr motion,
-00042                           dmxEnqueueProcPtr enqueue,
-00043                           dmxCheckSpecialProcPtr checkspecial,
-00044                           DMXBlockType block);
-00045 extern void    mouUSBInit(DevicePtr pDev);
-00046 extern void    mouUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00047 extern int     mouUSBOn(DevicePtr pDev);
-00048 extern void    mouUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00049 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html index ac03fe55b..293076b1f 100644 --- a/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html +++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html @@ -6,120 +6,186 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

usb-mouse.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

void mouUSBInit (DevicePtr pDev)
void mouUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int mouUSBOn (DevicePtr pDev)
+ + + + + +

Functions

void mouUSBRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void mouUSBInit (DevicePtr pDev)
void mouUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int mouUSBOn (DevicePtr pDev)
void mouUSBCtrl (DevicePtr pDev, PtrCtrl *ctrl)
-

Detailed Description

-Interface to USB mouse driver.
See also:
usb-mouse.c

-usb-common.c

-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to USB mouse driver.

+
See also:
usb-mouse.c
+
+usb-common.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void mouUSBGetInfo ( DevicePtr  pDev, void mouUSBCtrl (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoPtrCtrl *  ctrl 
) )
-
- - - - - -
-   - + +
-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + + + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
void mouUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
void mouUSBInit ( DevicePtr  pDev  ) )
+ +
+

Fill the info structure with information needed to initialize pDev.

+

References _DMXLocalInitInfo::buttonClass, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::map, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, mouUSBGetMap(), _DMXLocalInitInfo::numButtons, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::ptrFeedbackClass, _DMXLocalInitInfo::res, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + + + +
void mouUSBInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize pDev using usbInit.

-

-Initialize pDev using usbInit.

-

- - - - -
- +

References usbInit(), and usbMouse.

+ +

Referenced by mouUSBOn().

+ + + + +
+
+
- - - - - - + + + + + + +
int mouUSBOn ( DevicePtr  pDev  ) int mouUSBOn (DevicePtr  pDev ) 
+ +
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and mouUSBInit().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void mouUSBRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Turn pDev on (i.e., take input from pDev).

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html new file mode 100644 index 000000000..69d966cde --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html @@ -0,0 +1,81 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8c.html b/xorg-server/hw/dmx/doc/html/usb-other_8c.html index 284b4b79b..449fc4d45 100644 --- a/xorg-server/hw/dmx/doc/html/usb-other_8c.html +++ b/xorg-server/hw/dmx/doc/html/usb-other_8c.html @@ -6,177 +6,430 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-other.c File Reference

#include "usb-private.h"
-#include "dmxinputinit.h"
-#include "usb-other.h"
- - - - + + +
+

usb-other.c File Reference

#include "usb-private.h"
+#include "dmxinputinit.h"
+#include "usb-other.h"
+

Functions

void othUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+ + + + + + + + + + + + + + + + + + + +

Defines

#define GETPRIV
#define LOG0(f)   dmxLog(dmxDebug,f)
#define LOG1(f, a)   dmxLog(dmxDebug,f,a)
#define LOG2(f, a, b)   dmxLog(dmxDebug,f,a,b)
#define LOG3(f, a, b, c)   dmxLog(dmxDebug,f,a,b,c)
#define FATAL0(f)   dmxLog(dmxFatal,f)
#define FATAL1(f, a)   dmxLog(dmxFatal,f,a)
#define FATAL2(f, a, b)   dmxLog(dmxFatal,f,a,b)
#define MOTIONPROC   dmxMotionProcPtr
#define ENQUEUEPROC   dmxEnqueueProcPtr
#define CHECKPROC   dmxCheckSpecialProcPtr
#define BLOCK   DMXBlockType
#define test_bit(bit)   (priv->mask[(bit)/8] & (1 << ((bit)%8)))

Functions

void othUSBRead (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
void othUSBInit (DevicePtr pDev)
int othUSBOn (DevicePtr pDev)
void othUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
+

Detailed Description

+

This code implements a low-level device driver for a non-keyboard, non-mouse USB device (e.g., a joystick or gamepad).

+

Define Documentation

+ +
+
+ + + + +
#define BLOCK   DMXBlockType
+
+
-void othUSBInit (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define CHECKPROC   dmxCheckSpecialProcPtr
+
+
-int othUSBOn (DevicePtr pDev) +
+
+ +
+
+ + + + +
#define ENQUEUEPROC   dmxEnqueueProcPtr
+
+
-void othUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info) +
+
+ +
+
+ + + + + + + + + +
#define FATAL0(f  )    dmxLog(dmxFatal,f)
+
+
- -

Detailed Description

-This code implements a low-level device driver for a non-keyboard, non-mouse USB device (e.g., a joystick or gamepad).

Function Documentation

-

- - - - -
- + + + +
+
+
- - - - + + + + + + + + + +
void othUSBGetInfo ( DevicePtr  pDev, #define FATAL1(f,
a  )    dmxLog(dmxFatal,f,a)
+ +
+ +
+ + +
+
+ + + + + + + + - - + + - - + + + + +
#define FATAL2(f,
DMXLocalInitInfoPtr  infoa,
) b  )    dmxLog(dmxFatal,f,a,b)
+
+
+
+
+ +
+
+ + + +
#define GETPRIV
-
- - - - - -
-   - - -

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + +
+Value:
myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+
+ + +
+
+
- - - - - - + + + + + + +
void othUSBInit ( DevicePtr  pDev  ) #define LOG0(f  )    dmxLog(dmxDebug,f)
+ +
+
+ + +
+
+ + + + + + + + + + + + + +
#define LOG1(f,
a  )    dmxLog(dmxDebug,f,a)
-
- - - - - -
-   - - -

-Initialize pDev using usbInit.

-

- - - - -
- + +
+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + +
#define LOG2(f,
a,
b  )    dmxLog(dmxDebug,f,a,b)
+ +
+ +
+ + +
+
+ - - - - - - + + + + + + + + + + + + + + + + + + + + + +
int othUSBOn ( DevicePtr  pDev  ) #define LOG3(f,
a,
b,
c  )    dmxLog(dmxDebug,f,a,b,c)
+
+
+ +
+
+ +
+
+ + + + +
#define MOTIONPROC   dmxMotionProcPtr
+
+
+
+
+ +
+
+ + + + + + + + +
#define test_bit(bit  )    (priv->mask[(bit)/8] & (1 << ((bit)%8)))
-
- - - - - -
-   - - -

-Turn pDev on (i.e., take input from pDev).

-

- - - - -
- + +
+ +
+ +

Function Documentation

+ +
+
+
- - - - + + + + + + + + + - - + + +
void othUSBRead ( DevicePtr  pDev, void othUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
MOTIONPROC  motion, )
+ +
+

Fill the info structure with information needed to initialize pDev.

+ +

References _DMXLocalInitInfo::belFeedbackClass, DMX_MAX_AXES, dmxLog(), dmxWarning, GETPRIV, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::ledFeedbackClass, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numAbsAxes, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::res, test_bit, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + + +
void othUSBInit (DevicePtr  pDev ) 
+
+
+

Initialize pDev using usbInit.

+ +

References usbInit(), and usbOther.

+ +

Referenced by othUSBOn().

+ +
+
+ +
+
+ + + + + + + - - + +
int othUSBOn (DevicePtr  pDev )  ENQUEUEPROC  enqueue,
+
+
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and othUSBInit().

+ +
+
+ +
+
+ + + + + + + + + + + + - - + + + + + + + + - - + + - - + + -
void othUSBRead (DevicePtr  pDev,
MOTIONPROC  motion,
CHECKPROC  checkspecial, ENQUEUEPROC  enqueue,
CHECKPROC  checkspecial,
BLOCK  blockBLOCK  block 
) )
-
- - - - - -
-   - - -

-Read the USB device using usbRead.

+

+
+

Read the USB device using usbRead.

+ +

References usbRead().

+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html deleted file mode 100644 index d5cd221ff..000000000 --- a/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-other.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00038 #ifndef _USB_OTHER_H_
-00039 #define _USB_OTHER_H_
-00040 extern void    othUSBRead(DevicePtr pDev,
-00041                           dmxMotionProcPtr motion,
-00042                           dmxEnqueueProcPtr enqueue,
-00043                           dmxCheckSpecialProcPtr checkspecial,
-00044                           DMXBlockType block);
-00045 extern void    othUSBInit(DevicePtr pDev);
-00046 extern void    othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-00047 extern int     othUSBOn(DevicePtr pDev);
-00048 extern void    othUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00049 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h.html b/xorg-server/hw/dmx/doc/html/usb-other_8h.html index d3c80ae02..f720e9de0 100644 --- a/xorg-server/hw/dmx/doc/html/usb-other_8h.html +++ b/xorg-server/hw/dmx/doc/html/usb-other_8h.html @@ -6,120 +6,186 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
+ + +

usb-other.h File Reference

-

-Go to the source code of this file. - - - - - - - - +

Go to the source code of this file.

+

Functions

void othUSBInit (DevicePtr pDev)
void othUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int othUSBOn (DevicePtr pDev)
+ + + + + +

Functions

void othUSBRead (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
void othUSBInit (DevicePtr pDev)
void othUSBGetInfo (DevicePtr pDev, DMXLocalInitInfoPtr info)
int othUSBOn (DevicePtr pDev)
void othUSBCtrl (DevicePtr pDev, PtrCtrl *ctrl)
-

Detailed Description

-Interface to USB generic driver.
See also:
usb-other.c

-usb-common.c

-

Function Documentation

-

- - - - -
- +

Detailed Description

+

Interface to USB generic driver.

+
See also:
usb-other.c
+
+usb-common.c
+

Function Documentation

+ +
+
+
- - - - + + + + + - - - + + - - + + -
void othUSBGetInfo ( DevicePtr  pDev, void othUSBCtrl (DevicePtr  pDev,
DMXLocalInitInfoPtr  infoPtrCtrl *  ctrl 
) )
-
- - - - - -
-   - + +
-

-Fill the info structure with information needed to initialize pDev.

-

- - - - -
- + + + +
+
+
+ + + + + + + + + + + + - - - - - - + + + +
void othUSBGetInfo (DevicePtr  pDev,
DMXLocalInitInfoPtr  info 
void othUSBInit ( DevicePtr  pDev  ) )
+ +
+

Fill the info structure with information needed to initialize pDev.

+

References _DMXLocalInitInfo::belFeedbackClass, DMX_MAX_AXES, dmxLog(), dmxWarning, GETPRIV, _DMXLocalInitInfo::keyClass, _DMXLocalInitInfo::keySyms, _DMXLocalInitInfo::ledFeedbackClass, _DMXLocalInitInfo::maxres, _DMXLocalInitInfo::maxval, _DMXLocalInitInfo::minres, _DMXLocalInitInfo::minval, _DMXLocalInitInfo::numAbsAxes, _DMXLocalInitInfo::numRelAxes, _DMXLocalInitInfo::res, test_bit, and _DMXLocalInitInfo::valuatorClass.

+ +
+ + +
+
+ + + + + + + + +
void othUSBInit (DevicePtr  pDev ) 
-
- - - - - -
-   - + +
+

Initialize pDev using usbInit.

-

-Initialize pDev using usbInit.

-

- - - - -
- +

References usbInit(), and usbOther.

+ +

Referenced by othUSBOn().

+ + + + +
+
+
- - - - - - + + + + + + +
int othUSBOn ( DevicePtr  pDev  ) int othUSBOn (DevicePtr  pDev ) 
+ +
+

Turn pDev on (i.e., take input from pDev).

+ +

References GETPRIV, and othUSBInit().

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void othUSBRead (DevicePtr  pDev,
dmxMotionProcPtr  motion,
dmxEnqueueProcPtr  enqueue,
dmxCheckSpecialProcPtr  checkspecial,
DMXBlockType  block 
)
-
- - - - - -
-   - + +
-

-Turn pDev on (i.e., take input from pDev).

+

+ +
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html new file mode 100644 index 000000000..2243b43d0 --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html @@ -0,0 +1,81 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html deleted file mode 100644 index 3baac9582..000000000 --- a/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - File Index - - - - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-private.h

Go to the documentation of this file.
00001 /* $XFree86$ */
-00002 /*
-00003  * Copyright 2002 Red Hat Inc., Durham, North Carolina.
-00004  *
-00005  * All Rights Reserved.
-00006  *
-00007  * Permission is hereby granted, free of charge, to any person obtaining
-00008  * a copy of this software and associated documentation files (the
-00009  * "Software"), to deal in the Software without restriction, including
-00010  * without limitation on the rights to use, copy, modify, merge,
-00011  * publish, distribute, sublicense, and/or sell copies of the Software,
-00012  * and to permit persons to whom the Software is furnished to do so,
-00013  * subject to the following conditions:
-00014  *
-00015  * The above copyright notice and this permission notice (including the
-00016  * next paragraph) shall be included in all copies or substantial
-00017  * portions of the Software.
-00018  *
-00019  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-00020  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-00021  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-00022  * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-00023  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-00024  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-00025  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-00026  * SOFTWARE.
-00027  */
-00028 
-00029 /*
-00030  * Authors:
-00031  *   Rickard E. (Rik) Faith <faith@redhat.com>
-00032  *
-00033  */
-00034 
-00041 #ifndef _USB_PRIVATE_H_
-00042 #define _USB_PRIVATE_H_
-00043 
-00044 #include "dmxinputinit.h"
-00045 #include "inputstr.h"
-00046 #include "Xos.h"
-00047 #include <errno.h>
-00048 #include <linux/input.h>
-00049 #include "usb-common.h"
-00050 
-00051                                 /*  Support for force feedback was
-00052                                  *  introduced in Linxu 2.4.10 */
-00053 #ifndef EV_MSC
-00054 #define EV_MSC      0x04
-00055 #endif
-00056 #ifndef EV_FF
-00057 #define EV_FF       0x15
-00058 #endif
-00059 #ifndef LED_SLEEP
-00060 #define LED_SLEEP   0x05
-00061 #endif
-00062 #ifndef LED_SUSPEND
-00063 #define LED_SUSPEND 0x06
-00064 #endif
-00065 #ifndef LED_MUTE
-00066 #define LED_MUTE    0x07
-00067 #endif
-00068 #ifndef LED_MISC
-00069 #define LED_MISC    0x08
-00070 #endif
-00071 #ifndef BTN_DEAD
-00072 #define BTN_DEAD    0x12f
-00073 #endif
-00074 #ifndef BTN_THUMBL
-00075 #define BTN_THUMBL  0x13d
-00076 #endif
-00077 #ifndef BTN_THUMBR
-00078 #define BTN_THUMBR  0x13e
-00079 #endif
-00080 #ifndef MSC_SERIAL
-00081 #define MSC_SERIAL  0x00
-00082 #endif
-00083 #ifndef MSC_MAX
-00084 #define MSC_MAX     0x07
-00085 #endif
-00086 
-00087                                 /* Support for older kernels. */
-00088 #ifndef ABS_WHEEL
-00089 #define ABS_WHEEL   0x08
-00090 #endif
-00091 #ifndef ABS_GAS
-00092 #define ABS_GAS     0x09
-00093 #endif
-00094 #ifndef ABS_BRAKE
-00095 #define ABS_BRAKE   0x0a
-00096 #endif
-00097 
-00098 #define NUM_STATE_ENTRIES (256/32)
-00099 
-00100 /* Private area for USB devices. */
-00101 typedef struct _myPrivate {
-00102     DeviceIntPtr   pDevice;                 
-00103     int            fd;                      
-00104     unsigned char  mask[EV_MAX/8 + 1];      
-00105     int            numRel, numAbs, numLeds; 
-00106     int            relmap[DMX_MAX_AXES];    
-00107     int            absmap[DMX_MAX_AXES];    
-00109     CARD32         kbdState[NUM_STATE_ENTRIES]; 
-00110     DeviceIntPtr   pKeyboard;                   
-00112     int            pitch;       
-00113     unsigned long  duration;    
-00115     /* FIXME: dmxInput is never initialized */
-00116     DMXInputInfo   *dmxInput;   
-00117 } myPrivate;
-00118 #endif
-
-
- - Generated June 29, 2004 for Distributed Multihead X by - doxygen - 1.3.4. - - - - - diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h.html b/xorg-server/hw/dmx/doc/html/usb-private_8h.html index 360d88290..5720c3310 100644 --- a/xorg-server/hw/dmx/doc/html/usb-private_8h.html +++ b/xorg-server/hw/dmx/doc/html/usb-private_8h.html @@ -6,27 +6,291 @@ - -
Main Page | Alphabetical List | Data Structures | File List | Data Fields | Globals
-

usb-private.h File Reference

#include "dmxinputinit.h"
-#include "inputstr.h"
-#include "Xos.h"
-#include <errno.h>
-#include <linux/input.h>
-#include "usb-common.h"
- -

-Go to the source code of this file. - - - + + +
+

usb-private.h File Reference

#include "dmxinputinit.h"
+#include "inputstr.h"
+#include <X11/Xos.h>
+#include <errno.h>
+#include <linux/input.h>
+#include "usb-common.h"
+

Go to the source code of this file.

+

Data Structures

struct  _myPrivate
+ + + + + + + + + + + + + + + + + + + +

Data Structures

struct  _myPrivate

Defines

#define EV_MSC   0x04
#define EV_FF   0x15
#define LED_SLEEP   0x05
#define LED_SUSPEND   0x06
#define LED_MUTE   0x07
#define LED_MISC   0x08
#define BTN_DEAD   0x12f
#define BTN_THUMBL   0x13d
#define BTN_THUMBR   0x13e
#define MSC_SERIAL   0x00
#define MSC_MAX   0x07
#define ABS_WHEEL   0x08
#define ABS_GAS   0x09
#define ABS_BRAKE   0x0a
#define NUM_STATE_ENTRIES   (256/32)

Typedefs

typedef struct _myPrivate myPrivate
-

Detailed Description

-Private header file for USB support. This file provides Linux-specific include files and the definition of the private structure.
See also:
usb-common.c

-usb-keyboard.c

-usb-mouse.c

-usb-other.c

+

Detailed Description

+

Private header file for USB support. This file provides Linux-specific include files and the definition of the private structure.

+
See also:
usb-common.c
+
+usb-keyboard.c
+
+usb-mouse.c
+
+usb-other.c
+

Define Documentation

+ +
+
+ + + + +
#define ABS_BRAKE   0x0a
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define ABS_GAS   0x09
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define ABS_WHEEL   0x08
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define BTN_DEAD   0x12f
+
+
+ +
+
+ +
+
+ + + + +
#define BTN_THUMBL   0x13d
+
+
+ +
+
+ +
+
+ + + + +
#define BTN_THUMBR   0x13e
+
+
+ +
+
+ +
+
+ + + + +
#define EV_FF   0x15
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define EV_MSC   0x04
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define LED_MISC   0x08
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define LED_MUTE   0x07
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define LED_SLEEP   0x05
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define LED_SUSPEND   0x06
+
+
+ +

Referenced by usbPrint().

+ +
+
+ +
+
+ + + + +
#define MSC_MAX   0x07
+
+
+ +
+
+ +
+
+ + + + +
#define MSC_SERIAL   0x00
+
+
+ +
+
+ +
+
+ + + + +
#define NUM_STATE_ENTRIES   (256/32)
+
+
+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _myPrivate myPrivate
+
+
+ +
+
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html new file mode 100644 index 000000000..728767cbc --- /dev/null +++ b/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html @@ -0,0 +1,144 @@ + + + + + File Index + + + + + +
+
+ + Generated June 29, 2004 for Distributed Multihead X by + doxygen + 1.3.4. + + + + + diff --git a/xorg-server/hw/dmx/examples/Makefile.in b/xorg-server/hw/dmx/examples/Makefile.in index db656c682..2c5b19db3 100644 --- a/xorg-server/hw/dmx/examples/Makefile.in +++ b/xorg-server/hw/dmx/examples/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -199,7 +199,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -224,7 +223,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -248,6 +246,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -265,8 +264,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -312,7 +309,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -338,6 +334,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -347,7 +344,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -361,7 +357,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -403,8 +398,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -447,6 +440,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -478,7 +472,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.in b/xorg-server/hw/dmx/glxProxy/Makefile.in index 29894ccf2..0f3ec55f1 100644 --- a/xorg-server/hw/dmx/glxProxy/Makefile.in +++ b/xorg-server/hw/dmx/glxProxy/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -254,7 +251,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -268,7 +264,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -354,6 +347,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -385,7 +379,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/input/Makefile.in b/xorg-server/hw/dmx/input/Makefile.in index db8d24382..c25f1c9a2 100644 --- a/xorg-server/hw/dmx/input/Makefile.in +++ b/xorg-server/hw/dmx/input/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -145,7 +144,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -169,6 +167,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -186,8 +185,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -233,7 +230,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -259,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -268,7 +265,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -282,7 +278,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -324,8 +319,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -368,6 +361,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -399,7 +393,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/dmx/input/dmxbackend.c b/xorg-server/hw/dmx/input/dmxbackend.c index b94c6d468..55615cf39 100644 --- a/xorg-server/hw/dmx/input/dmxbackend.c +++ b/xorg-server/hw/dmx/input/dmxbackend.c @@ -236,7 +236,7 @@ static int dmxBackendOffscreen(int screen, int x, int y) } /** This routine is called from #dmxCoreMotion for each motion - * event. #x and #y are global coordinants. */ + * event. \a x and \a y are global coordinants. */ void dmxBackendUpdatePosition(pointer private, int x, int y) { GETPRIVFROMPRIVATE; diff --git a/xorg-server/hw/dmx/input/dmxcommon.c b/xorg-server/hw/dmx/input/dmxcommon.c index 8c8cefa53..da5b77893 100644 --- a/xorg-server/hw/dmx/input/dmxcommon.c +++ b/xorg-server/hw/dmx/input/dmxcommon.c @@ -519,7 +519,7 @@ void dmxCommonMouOff(DevicePtr pDev) /** Given the global coordinates \a x and \a y, determine the screen * with the lowest number on which those coordinates lie. If they are * not on any screen, return -1. The number returned is an index into - * #dmxScreenInfo and is between -1 and #dmxNumScreens - 1, + * \a dmxScreenInfo and is between -1 and \a dmxNumScreens - 1, * inclusive. */ int dmxFindPointerScreen(int x, int y) { diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c index 70737b4c4..dfa6bdad5 100644 --- a/xorg-server/hw/dmx/input/dmxevents.c +++ b/xorg-server/hw/dmx/input/dmxevents.c @@ -552,7 +552,7 @@ void dmxInvalidateGlobalPosition(void) * allowed to move outside the global boundaires). * * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be - * blocked around calls to #dmxeqEnqueue(). */ + * blocked around calls to \a enqueueMotion(). */ void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount, DMXMotionType type, DMXBlockType block) { @@ -652,8 +652,9 @@ static int dmxFixup(DevicePtr pDev, int detail, KeySym keySym) * specified \a type and \a detail. If the event is a KeyPress or * KeyRelease event, then the \a keySym is also specified. * + * FIXME: make the code do what the comment says, or remove this comment. * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be - * blocked around calls to #dmxeqEnqueue(). */ + * blocked around calls to dmxeqEnqueue(). */ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block) diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c index d8402e87f..5a486a464 100644 --- a/xorg-server/hw/dmx/input/dmxinputinit.c +++ b/xorg-server/hw/dmx/input/dmxinputinit.c @@ -474,9 +474,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) Relative); for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, axis_labels[i], - info.minval[0], info.maxval[0], - info.res[0], - info.minres[0], info.maxres[0]); + info.minval[i], info.maxval[i], + info.res[i], + info.minres[i], info.maxres[i]); } else if (info.numRelAxes) { InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, axis_labels, @@ -484,20 +484,20 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) Relative); for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, axis_labels[i], - info.minval[0], - info.maxval[0], info.res[0], - info.minres[0], info.maxres[0]); + info.minval[i], + info.maxval[i], info.res[i], + info.minres[i], info.maxres[i]); } else if (info.numAbsAxes) { InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, axis_labels, dmxPointerGetMotionBufferSize(), Absolute); for (i = 0; i < info.numAbsAxes; i++) - InitValuatorAxisStruct(pDevice, i+info.numRelAxes, - axis_labels[i + info.numRelAxes], - info.minval[i+1], info.maxval[i+1], - info.res[i+1], info.minres[i+1], - info.maxres[i+1]); + InitValuatorAxisStruct(pDevice, i, + axis_labels[i], + info.minval[i], info.maxval[i], + info.res[i], info.minres[i], + info.maxres[i]); } } if (info.focusClass) InitFocusClassDeviceStruct(pDevice); @@ -933,7 +933,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI) } /** Re-initialize all the devices described in \a dmxInput. Called from - #dmxReconfig before the cursor is redisplayed. */ + #dmxAdjustCursorBoundaries before the cursor is redisplayed. */ void dmxInputReInit(DMXInputInfo *dmxInput) { int i; @@ -946,7 +946,7 @@ void dmxInputReInit(DMXInputInfo *dmxInput) } /** Re-initialize all the devices described in \a dmxInput. Called from - #dmxReconfig after the cursor is redisplayed. */ + #dmxAdjustCursorBoundaries after the cursor is redisplayed. */ void dmxInputLateReInit(DMXInputInfo *dmxInput) { int i; diff --git a/xorg-server/hw/dmx/input/usb-common.c b/xorg-server/hw/dmx/input/usb-common.c index 2d3f4dd5f..95c00b839 100644 --- a/xorg-server/hw/dmx/input/usb-common.c +++ b/xorg-server/hw/dmx/input/usb-common.c @@ -33,8 +33,8 @@ /** \file * - * Routines that are common between #usb-keyboard.c, #usb-mouse.c, and - * #usb-other.c */ + * Routines that are common between \a usb-keyboard.c, \a usb-mouse.c, and + * \a usb-other.c */ #ifdef HAVE_DMX_CONFIG_H #include diff --git a/xorg-server/hw/kdrive/Makefile.am b/xorg-server/hw/kdrive/Makefile.am index e20d4d6d2..906a14c60 100644 --- a/xorg-server/hw/kdrive/Makefile.am +++ b/xorg-server/hw/kdrive/Makefile.am @@ -6,10 +6,6 @@ if XFAKESERVER XFAKE_SUBDIRS = fake endif -if XSDLSERVER -XSDL_SUBDIRS = sdl -endif - if XEPHYR XEPHYR_SUBDIRS = ephyr endif @@ -19,7 +15,6 @@ LINUX_SUBDIRS = linux endif SERVER_SUBDIRS = \ - $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ $(XEPHYR_SUBDIRS) \ $(XFAKE_SUBDIRS) @@ -29,7 +24,7 @@ SUBDIRS = \ $(LINUX_SUBDIRS) \ $(SERVER_SUBDIRS) -DIST_SUBDIRS = fbdev sdl ephyr src linux fake +DIST_SUBDIRS = fbdev ephyr src linux fake relink: @for i in $(SERVER_SUBDIRS) ; do make -C $$i relink ; done diff --git a/xorg-server/hw/kdrive/Makefile.in b/xorg-server/hw/kdrive/Makefile.in index a3a242f89..81c69a524 100644 --- a/xorg-server/hw/kdrive/Makefile.in +++ b/xorg-server/hw/kdrive/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -108,7 +108,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -133,7 +132,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -157,6 +155,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -174,8 +173,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -221,7 +218,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -247,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -256,7 +253,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -270,7 +266,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -312,8 +307,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -356,6 +349,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -387,7 +381,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -397,11 +390,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @BUILD_KDRIVEFBDEVLIB_TRUE@FBDEV_SUBDIRS = fbdev @XFAKESERVER_TRUE@XFAKE_SUBDIRS = fake -@XSDLSERVER_TRUE@XSDL_SUBDIRS = sdl @XEPHYR_TRUE@XEPHYR_SUBDIRS = ephyr @KDRIVELINUX_TRUE@LINUX_SUBDIRS = linux SERVER_SUBDIRS = \ - $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ $(XEPHYR_SUBDIRS) \ $(XFAKE_SUBDIRS) @@ -411,7 +402,7 @@ SUBDIRS = \ $(LINUX_SUBDIRS) \ $(SERVER_SUBDIRS) -DIST_SUBDIRS = fbdev sdl ephyr src linux fake +DIST_SUBDIRS = fbdev ephyr src linux fake all: all-recursive .SUFFIXES: diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.in b/xorg-server/hw/kdrive/ephyr/Makefile.in index 9540106e6..0531c7026 100644 --- a/xorg-server/hw/kdrive/ephyr/Makefile.in +++ b/xorg-server/hw/kdrive/ephyr/Makefile.in @@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -158,7 +158,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -183,7 +182,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -207,6 +205,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -224,8 +223,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -271,7 +268,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -297,6 +293,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -306,7 +303,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -320,7 +316,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -362,8 +357,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -406,6 +399,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -437,7 +431,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -933,10 +926,10 @@ Xephyr.$(APP_MAN_SUFFIX): Xephyr.man $(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX) .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ # 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. diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c index eecad7e42..2b72b4e0a 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c @@ -93,6 +93,13 @@ InitInput (int argc, char **argv) KdInitInput(); } +#ifdef DDXBEFORERESET +void +ddxBeforeReset (void) +{ +} +#endif + void ddxUseMsg (void) { diff --git a/xorg-server/hw/kdrive/fake/Makefile.in b/xorg-server/hw/kdrive/fake/Makefile.in index f879f6159..4231f2f54 100644 --- a/xorg-server/hw/kdrive/fake/Makefile.in +++ b/xorg-server/hw/kdrive/fake/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -104,7 +104,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -129,7 +128,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -153,6 +151,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -170,8 +169,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -217,7 +214,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -243,6 +239,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -252,7 +249,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -266,7 +262,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -308,8 +303,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -352,6 +345,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -383,7 +377,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/kdrive/fake/fakeinit.c b/xorg-server/hw/kdrive/fake/fakeinit.c index 2cfcbedd5..0472a7183 100644 --- a/xorg-server/hw/kdrive/fake/fakeinit.c +++ b/xorg-server/hw/kdrive/fake/fakeinit.c @@ -60,6 +60,13 @@ InitInput (int argc, char **argv) KdInitInput (); } +#ifdef DDXBEFORERESET +void +ddxBeforeReset (void) +{ +} +#endif + void ddxUseMsg (void) { diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.in b/xorg-server/hw/kdrive/fbdev/Makefile.in index 19ecaf165..20b40496e 100644 --- a/xorg-server/hw/kdrive/fbdev/Makefile.in +++ b/xorg-server/hw/kdrive/fbdev/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -130,7 +129,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -154,6 +152,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -171,8 +170,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -218,7 +215,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -244,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -253,7 +250,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -267,7 +263,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -309,8 +304,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -353,6 +346,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -384,7 +378,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/kdrive/linux/Makefile.am b/xorg-server/hw/kdrive/linux/Makefile.am index be07561ef..13df142f7 100644 --- a/xorg-server/hw/kdrive/linux/Makefile.am +++ b/xorg-server/hw/kdrive/linux/Makefile.am @@ -17,7 +17,6 @@ KDRIVE_HW_SOURCES = \ liblinux_la_SOURCES = \ bus.c \ - klinux.h \ mouse.c \ ms.c \ ps2.c \ diff --git a/xorg-server/hw/kdrive/linux/Makefile.in b/xorg-server/hw/kdrive/linux/Makefile.in index 87e6503c5..a5b0791d7 100644 --- a/xorg-server/hw/kdrive/linux/Makefile.in +++ b/xorg-server/hw/kdrive/linux/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -57,8 +57,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) liblinux_la_LIBADD = -am__liblinux_la_SOURCES_DIST = bus.c klinux.h mouse.c ms.c ps2.c \ - evdev.c keyboard.c linux.c tslib.c +am__liblinux_la_SOURCES_DIST = bus.c mouse.c ms.c ps2.c evdev.c \ + keyboard.c linux.c tslib.c am__objects_1 = evdev.lo keyboard.lo linux.lo @TSLIB_TRUE@am__objects_2 = tslib.lo am_liblinux_la_OBJECTS = bus.lo mouse.lo ms.lo ps2.lo $(am__objects_1) \ @@ -100,7 +100,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -125,7 +124,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -149,6 +147,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -166,8 +165,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -213,7 +210,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -239,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -248,7 +245,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -262,7 +258,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -304,8 +299,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -348,6 +341,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -379,7 +373,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -401,7 +394,6 @@ KDRIVE_HW_SOURCES = \ liblinux_la_SOURCES = \ bus.c \ - klinux.h \ mouse.c \ ms.c \ ps2.c \ diff --git a/xorg-server/hw/kdrive/linux/bus.c b/xorg-server/hw/kdrive/linux/bus.c index ba8a6cd43..93c3ea5f3 100644 --- a/xorg-server/hw/kdrive/linux/bus.c +++ b/xorg-server/hw/kdrive/linux/bus.c @@ -72,7 +72,7 @@ BusInit (KdPointerInfo *pi) { for (i = 0; i < NUM_BUS_NAMES; i++) { - if ((fd = open (BusNames[i], 0)) > 0) + if ((fd = open (BusNames[i], 0)) >= 0) { close(fd); if (pi->path) @@ -84,7 +84,7 @@ BusInit (KdPointerInfo *pi) } else { - if ((fd = open(pi->path, 0)) > 0) + if ((fd = open(pi->path, 0)) >= 0) { close(fd); return Success; @@ -99,7 +99,7 @@ BusEnable (KdPointerInfo *pi) { int fd = open(pi->path, 0); - if (fd > 0) + if (fd >= 0) { KdRegisterFd(fd, BusRead, pi); pi->driverPrivate = (void *)fd; diff --git a/xorg-server/hw/kdrive/linux/klinux.h b/xorg-server/hw/kdrive/linux/klinux.h deleted file mode 100644 index 349685241..000000000 --- a/xorg-server/hw/kdrive/linux/klinux.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _KLINUX_H_ -#define _KLINUX_H_ - -Bool -LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr); - -unsigned char * -LinuxGetPciCfg(KdCardAttr *attr); - -#endif /* _KLINUX_H_ */ diff --git a/xorg-server/hw/kdrive/linux/linux.c b/xorg-server/hw/kdrive/linux/linux.c index 3fba056df..f76c2cbd9 100644 --- a/xorg-server/hw/kdrive/linux/linux.c +++ b/xorg-server/hw/kdrive/linux/linux.c @@ -24,7 +24,6 @@ #include #endif #include "kdrive.h" -#include "klinux.h" #include #include #include @@ -125,110 +124,6 @@ LinuxInit (void) return 1; } -Bool -LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr) -{ - FILE *f; - char line[2048], *l, *end; - CARD32 bus, id, addr; - int n; - CARD32 ven_dev; - Bool ret = FALSE; - int i; - - attr->vendorID = vendor; - attr->deviceID = device; - ven_dev = (((CARD32) vendor) << 16) | ((CARD32) device); - f = fopen ("/proc/bus/pci/devices", "r"); - if (!f) - return FALSE; - attr->io = 0; - while (fgets (line, sizeof (line)-1, f)) - { - line[sizeof(line)-1] = '\0'; - l = line; - bus = strtoul (l, &end, 16); - if (end == l) - continue; - l = end; - id = strtoul (l, &end, 16); - if (end == l) - continue; - l = end; - if (id != ven_dev) - continue; - if (count--) - continue; - (void) strtoul (l, &end, 16); /* IRQ */ - if (end == l) - continue; - l = end; - n = 0; - for (i = 0; i < 6; i++) - { - addr = strtoul (l, &end, 16); - if (end == l) - break; - if (addr & 1) - attr->io = addr & ~0xf; - else - { - if (n == KD_MAX_CARD_ADDRESS) - break; - attr->address[n++] = addr & ~0xf; - } - l = end; - } - while (n > 0) - { - if (attr->address[n-1] != 0) - break; - n--; - } - attr->naddr = n; - attr->domain = 0; /* XXX */ - attr->bus = (bus >> 8) & 0xff; - attr->slot = (bus >> 3) & 0x1f; - attr->func = bus & 0x07; - ret = TRUE; - break; - } - fclose (f); - return ret; -} - -unsigned char * -LinuxGetPciCfg(KdCardAttr *attr) -{ - char filename[256]; - FILE *f; - unsigned char *cfg; - int r; - - snprintf(filename, 255, "/proc/bus/pci/%02x/%02x.%x", - attr->bus >> 8, (attr->bus & 0xff) >> 3, attr->bus & 7); -/* fprintf(stderr,"Find card on path %s\n",filename); */ - - if (!(f=fopen(filename,"r"))) - return NULL; - - if (!(cfg=xalloc(256))) - { - fclose(f); - return NULL; - } - - if (256 != (r=fread(cfg, 1, 256, f))) - { - fprintf(stderr,"LinuxGetPciCfg: read %d, expected 256\n",r); - free(cfg); - cfg=NULL; - } - fclose(f); -/* fprintf(stderr,"LinuxGetPciCfg: success, returning %p\n",cfg); */ - return cfg; -} - static void LinuxSetSwitchMode (int mode) { diff --git a/xorg-server/hw/kdrive/linux/tslib.c b/xorg-server/hw/kdrive/linux/tslib.c index 59011b0e3..7cc23e637 100644 --- a/xorg-server/hw/kdrive/linux/tslib.c +++ b/xorg-server/hw/kdrive/linux/tslib.c @@ -151,10 +151,6 @@ TslibDisable (KdPointerInfo *pi) static Status TslibInit (KdPointerInfo *pi) { - int fd = 0, i = 0; - DIR *inputdir = NULL; - struct dirent *inputent = NULL; - struct tsdev *tsDev = NULL; struct TslibPrivate *private = NULL; if (!pi || !pi->dixdev) diff --git a/xorg-server/hw/kdrive/sdl/Makefile.am b/xorg-server/hw/kdrive/sdl/Makefile.am deleted file mode 100644 index 0973cb4ea..000000000 --- a/xorg-server/hw/kdrive/sdl/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = \ - @KDRIVE_PURE_INCS@ \ - @KDRIVE_CFLAGS@ \ - @XSDL_INCS@ - -bin_PROGRAMS = Xsdl - -Xsdl_SOURCES = sdl.c - -Xsdl_LDADD = \ - @KDRIVE_LIBS@ \ - @XSDL_LIBS@ - -Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ - -Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/xorg-server/hw/kdrive/sdl/Makefile.in b/xorg-server/hw/kdrive/sdl/Makefile.in deleted file mode 100644 index 80df51441..000000000 --- a/xorg-server/hw/kdrive/sdl/Makefile.in +++ /dev/null @@ -1,726 +0,0 @@ -# Makefile.in generated by automake 1.11 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. - -@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 = Xsdl$(EXEEXT) -subdir = hw/kdrive/sdl -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ - $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \ - $(top_builddir)/include/xorg-server.h \ - $(top_builddir)/include/dix-config.h \ - $(top_builddir)/include/xorg-config.h \ - $(top_builddir)/include/xkb-config.h \ - $(top_builddir)/include/xwin-config.h \ - $(top_builddir)/include/kdrive-config.h \ - $(top_builddir)/include/version-config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am_Xsdl_OBJECTS = sdl.$(OBJEXT) -Xsdl_OBJECTS = $(am_Xsdl_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -Xsdl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(Xsdl_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -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) -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 = $(Xsdl_SOURCES) -DIST_SOURCES = $(Xsdl_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ -APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ -APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ -APP_MAN_DIR = @APP_MAN_DIR@ -APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BASE_FONT_PATH = @BASE_FONT_PATH@ -BUILD_DATE = @BUILD_DATE@ -BUILD_TIME = @BUILD_TIME@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHANGELOG_CMD = @CHANGELOG_CMD@ -COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ -CYGPATH_W = @CYGPATH_W@ -DARWIN_LIBS = @DARWIN_LIBS@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ -DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@ -DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@ -DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DGA_CFLAGS = @DGA_CFLAGS@ -DGA_LIBS = @DGA_LIBS@ -DIX_CFLAGS = @DIX_CFLAGS@ -DIX_LIB = @DIX_LIB@ -DLLTOOL = @DLLTOOL@ -DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ -DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ -DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ -DMXMODULES_LIBS = @DMXMODULES_LIBS@ -DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@ -DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ -DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ -DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ -DOLT_BASH = @DOLT_BASH@ -DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ -DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ -DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ -DRIPROTO_LIBS = @DRIPROTO_LIBS@ -DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ -DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ -DRI_CFLAGS = @DRI_CFLAGS@ -DRI_DRIVER_PATH = @DRI_DRIVER_PATH@ -DRI_LIBS = @DRI_LIBS@ -DSYMUTIL = @DSYMUTIL@ -DTRACE = @DTRACE@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ -FGREP = @FGREP@ -FILE_MAN_DIR = @FILE_MAN_DIR@ -FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_LIBS = @GLIB_LIBS@ -GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ -GLX_DEFINES = @GLX_DEFINES@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -GREP = @GREP@ -HAL_CFLAGS = @HAL_CFLAGS@ -HAL_LIBS = @HAL_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ -KDRIVE_INCS = @KDRIVE_INCS@ -KDRIVE_LIBS = @KDRIVE_LIBS@ -KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@ -KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@ -KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@ -LAUNCHD_ID_PREFIX = @LAUNCHD_ID_PREFIX@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ -LIBDRM_LIBS = @LIBDRM_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIB_MAN_DIR = @LIB_MAN_DIR@ -LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -LINUXDOC = @LINUXDOC@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTCOMPILE = @LTCOMPILE@ -LTCXXCOMPILE = @LTCXXCOMPILE@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ -MAKEINFO = @MAKEINFO@ -MAKE_HTML = @MAKE_HTML@ -MAKE_PDF = @MAKE_PDF@ -MAKE_PS = @MAKE_PS@ -MAKE_TEXT = @MAKE_TEXT@ -MISC_MAN_DIR = @MISC_MAN_DIR@ -MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJC = @OBJC@ -OBJCCLD = @OBJCCLD@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJCLINK = @OBJCLINK@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_LIB = @OS_LIB@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -PCIACCESS_LIBS = @PCIACCESS_LIBS@ -PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -PROJECTROOT = @PROJECTROOT@ -PS2PDF = @PS2PDF@ -Q = @Q@ -RANLIB = @RANLIB@ -RAWCPP = @RAWCPP@ -RAWCPPFLAGS = @RAWCPPFLAGS@ -SED = @SED@ -SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ -SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ -STRIP = @STRIP@ -TSLIB_CFLAGS = @TSLIB_CFLAGS@ -TSLIB_LIBS = @TSLIB_LIBS@ -UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ -VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@ -X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@ -XDMCP_CFLAGS = @XDMCP_CFLAGS@ -XDMCP_LIBS = @XDMCP_LIBS@ -XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@ -XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@ -XDMX_CFLAGS = @XDMX_CFLAGS@ -XDMX_LIBS = @XDMX_LIBS@ -XDMX_SYS_LIBS = @XDMX_SYS_LIBS@ -XEPHYR_CFLAGS = @XEPHYR_CFLAGS@ -XEPHYR_INCS = @XEPHYR_INCS@ -XEPHYR_LIBS = @XEPHYR_LIBS@ -XF86CONFIGFILE = @XF86CONFIGFILE@ -XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@ -XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@ -XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@ -XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@ -XKB_COMPILED_DIR = @XKB_COMPILED_DIR@ -XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@ -XLIB_CFLAGS = @XLIB_CFLAGS@ -XLIB_LIBS = @XLIB_LIBS@ -XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@ -XNESTMODULES_LIBS = @XNESTMODULES_LIBS@ -XNEST_LIBS = @XNEST_LIBS@ -XNEST_SYS_LIBS = @XNEST_SYS_LIBS@ -XORG_CFLAGS = @XORG_CFLAGS@ -XORG_INCS = @XORG_INCS@ -XORG_LIBS = @XORG_LIBS@ -XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@ -XORG_MODULES_LIBS = @XORG_MODULES_LIBS@ -XORG_OS = @XORG_OS@ -XORG_OS_SUBDIR = @XORG_OS_SUBDIR@ -XORG_SYS_LIBS = @XORG_SYS_LIBS@ -XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@ -XPBPROXY_LIBS = @XPBPROXY_LIBS@ -XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ -XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ -XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ -XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ -XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ -XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ -XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@ -XSERVER_LIBS = @XSERVER_LIBS@ -XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@ -XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@ -XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@ -XVFB_LIBS = @XVFB_LIBS@ -XVFB_SYS_LIBS = @XVFB_SYS_LIBS@ -XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@ -XWINMODULES_LIBS = @XWINMODULES_LIBS@ -XWIN_LIBS = @XWIN_LIBS@ -XWIN_SERVER_NAME = @XWIN_SERVER_NAME@ -XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -__XCONFIGFILE__ = @__XCONFIGFILE__@ -abi_ansic = @abi_ansic@ -abi_extension = @abi_extension@ -abi_videodrv = @abi_videodrv@ -abi_xinput = @abi_xinput@ -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_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@ -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@ -docdir = @docdir@ -driverdir = @driverdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -extdir = @extdir@ -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@ -moduledir = @moduledir@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdkdir = @sdkdir@ -sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ -srcdir = @srcdir@ -symbol_visibility = @symbol_visibility@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -INCLUDES = \ - @KDRIVE_PURE_INCS@ \ - @KDRIVE_CFLAGS@ \ - @XSDL_INCS@ - -Xsdl_SOURCES = sdl.c -Xsdl_LDADD = \ - @KDRIVE_LIBS@ \ - @XSDL_LIBS@ - -Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ -Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -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) --foreign hw/kdrive/sdl/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign hw/kdrive/sdl/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 -Xsdl$(EXEEXT): $(Xsdl_OBJECTS) $(Xsdl_DEPENDENCIES) - @rm -f Xsdl$(EXEEXT) - $(AM_V_CCLD)$(Xsdl_LINK) $(Xsdl_OBJECTS) $(Xsdl_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdl.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@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 $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -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) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; 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-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-binPROGRAMS - -.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-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 installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS - - -relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) - -# 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: diff --git a/xorg-server/hw/kdrive/sdl/sdl.c b/xorg-server/hw/kdrive/sdl/sdl.c deleted file mode 100644 index a83c84a5d..000000000 --- a/xorg-server/hw/kdrive/sdl/sdl.c +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright © 2004 PillowElephantBadgerBankPond - - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of PillowElephantBadgerBankPond not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. PillowElephantBadgerBankPond makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL PillowElephantBadgerBankPond BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - * - * It's really not my fault - see it was the elephants!! - * - jaymz - * - */ -#ifdef HAVE_CONFIG_H -#include "kdrive-config.h" -#endif -#include "kdrive.h" -#include -#include - -static void xsdlFini(void); -static Bool sdlScreenInit(KdScreenInfo *screen); -static Bool sdlFinishInitScreen(ScreenPtr pScreen); -static Bool sdlCreateRes(ScreenPtr pScreen); - -static void sdlKeyboardFini(KdKeyboardInfo *ki); -static Bool sdlKeyboardInit(KdKeyboardInfo *ki); - -static Bool sdlMouseInit(KdPointerInfo *pi); -static void sdlMouseFini(KdPointerInfo *pi); - -void *sdlShadowWindow (ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure); -void sdlShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf); - -void sdlTimer(void); - -KdKeyboardInfo *sdlKeyboard = NULL; -KdPointerInfo *sdlPointer = NULL; - -KdKeyboardDriver sdlKeyboardDriver = { - .name = "keyboard", - .Init = sdlKeyboardInit, - .Fini = sdlKeyboardFini, -}; - -KdPointerDriver sdlMouseDriver = { - .name = "mouse", - .Init = sdlMouseInit, - .Fini = sdlMouseFini, -}; - - -KdCardFuncs sdlFuncs = { - .scrinit = sdlScreenInit, /* scrinit */ - .finishInitScreen = sdlFinishInitScreen, /* finishInitScreen */ - .createRes = sdlCreateRes, /* createRes */ -}; - -int mouseState=0; - -struct SdlDriver -{ - SDL_Surface *screen; -}; - - - -static Bool sdlScreenInit(KdScreenInfo *screen) -{ - struct SdlDriver *sdlDriver=calloc(1, sizeof(struct SdlDriver)); -#ifdef DEBUG - printf("sdlScreenInit()\n"); -#endif - if (!screen->width || !screen->height) - { - screen->width = 640; - screen->height = 480; - } - if (!screen->fb[0].depth) - screen->fb[0].depth = 4; -#ifdef DEBUG - printf("Attempting for %dx%d/%dbpp mode\n", screen->width, screen->height, screen->fb[0].depth); -#endif - sdlDriver->screen=SDL_SetVideoMode(screen->width, screen->height, screen->fb[0].depth, 0); - if(sdlDriver->screen==NULL) - return FALSE; -#ifdef DEBUG - printf("Set %dx%d/%dbpp mode\n", sdlDriver->screen->w, sdlDriver->screen->h, sdlDriver->screen->format->BitsPerPixel); -#endif - screen->width=sdlDriver->screen->w; - screen->height=sdlDriver->screen->h; - screen->fb[0].depth=sdlDriver->screen->format->BitsPerPixel; - screen->fb[0].visuals=(1<fb[0].redMask=sdlDriver->screen->format->Rmask; - screen->fb[0].greenMask=sdlDriver->screen->format->Gmask; - screen->fb[0].blueMask=sdlDriver->screen->format->Bmask; - screen->fb[0].bitsPerPixel=sdlDriver->screen->format->BitsPerPixel; - screen->rate=60; - screen->memory_base=(CARD8 *)sdlDriver->screen->pixels; - screen->memory_size=0; - screen->off_screen_base=0; - screen->driver=sdlDriver; - screen->fb[0].byteStride=(sdlDriver->screen->w*sdlDriver->screen->format->BitsPerPixel)/8; - screen->fb[0].pixelStride=sdlDriver->screen->w; - screen->fb[0].frameBuffer=(CARD8 *)sdlDriver->screen->pixels; - SDL_WM_SetCaption("Freedesktop.org X server (SDL)", NULL); - return TRUE; -} - -void sdlShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf) -{ - KdScreenPriv(pScreen); - KdScreenInfo *screen = pScreenPriv->screen; - struct SdlDriver *sdlDriver=screen->driver; -#ifdef DEBUG - printf("Shadow update()\n"); -#endif - if(SDL_MUSTLOCK(sdlDriver->screen)) - { - if(SDL_LockSurface(sdlDriver->screen)<0) - { -#ifdef DEBUG - printf("Couldn't lock SDL surface - d'oh!\n"); -#endif - return; - } - } - - if(SDL_MUSTLOCK(sdlDriver->screen)) - SDL_UnlockSurface(sdlDriver->screen); - SDL_UpdateRect(sdlDriver->screen, 0, 0, sdlDriver->screen->w, sdlDriver->screen->h); -} - - -void *sdlShadowWindow (ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure) -{ - KdScreenPriv(pScreen); - KdScreenInfo *screen = pScreenPriv->screen; - struct SdlDriver *sdlDriver=screen->driver; - *size=(sdlDriver->screen->w*sdlDriver->screen->format->BitsPerPixel)/8; -#ifdef DEBUG - printf("Shadow window()\n"); -#endif - return (void *)((CARD8 *)sdlDriver->screen->pixels + row * (*size) + offset); -} - - -static Bool sdlCreateRes(ScreenPtr pScreen) -{ - KdScreenPriv(pScreen); - KdScreenInfo *screen = pScreenPriv->screen; - KdShadowFbAlloc(screen, 0, FALSE); - KdShadowSet(pScreen, RR_Rotate_0, sdlShadowUpdate, sdlShadowWindow); - return TRUE; -} - -static Bool sdlFinishInitScreen(ScreenPtr pScreen) -{ - if (!shadowSetup (pScreen)) - return FALSE; - -/* -#ifdef RANDR - if (!sdlRandRInit (pScreen)) - return FALSE; -#endif -*/ - return TRUE; -} - -static void sdlKeyboardFini(KdKeyboardInfo *ki) -{ - sdlKeyboard = NULL; -} - -static Bool sdlKeyboardInit(KdKeyboardInfo *ki) -{ - ki->minScanCode = 8; - ki->maxScanCode = 255; - - sdlKeyboard = ki; - - return TRUE; -} - -static Bool sdlMouseInit (KdPointerInfo *pi) -{ - sdlPointer = pi; - return TRUE; -} - -static void sdlMouseFini(KdPointerInfo *pi) -{ - sdlPointer = NULL; -} - - -void InitCard(char *name) -{ - KdCardAttr attr; - KdCardInfoAdd (&sdlFuncs, &attr, 0); -#ifdef DEBUG - printf("InitCard: %s\n", name); -#endif -} - -void InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) -{ - KdInitOutput(pScreenInfo, argc, argv); -#ifdef DEBUG - printf("InitOutput()\n"); -#endif -} - -void InitInput(int argc, char **argv) -{ - KdPointerInfo *pi; - KdKeyboardInfo *ki; - - KdAddKeyboardDriver(&sdlKeyboardDriver); - KdAddPointerDriver(&sdlMouseDriver); - - ki = KdParseKeyboard("keyboard"); - KdAddKeyboard(ki); - pi = KdParsePointer("mouse"); - KdAddPointer(pi); - - KdInitInput(); -} - -void ddxUseMsg(void) -{ - KdUseMsg(); -} - -int ddxProcessArgument(int argc, char **argv, int i) -{ - return KdProcessArgument(argc, argv, i); -} - -void sdlTimer(void) -{ - static int buttonState=0; - SDL_Event event; - SDL_ShowCursor(FALSE); - /* get the mouse state */ - while ( SDL_PollEvent(&event) ) { - switch (event.type) { - case SDL_MOUSEMOTION: - KdEnqueuePointerEvent(sdlPointer, mouseState, event.motion.x, event.motion.y, 0); - break; - case SDL_MOUSEBUTTONDOWN: - switch(event.button.button) - { - case 1: - buttonState=KD_BUTTON_1; - break; - case 2: - buttonState=KD_BUTTON_2; - break; - case 3: - buttonState=KD_BUTTON_3; - break; - } - mouseState|=buttonState; - KdEnqueuePointerEvent(sdlPointer, mouseState|KD_MOUSE_DELTA, 0, 0, 0); - break; - case SDL_MOUSEBUTTONUP: - switch(event.button.button) - { - case 1: - buttonState=KD_BUTTON_1; - break; - case 2: - buttonState=KD_BUTTON_2; - break; - case 3: - buttonState=KD_BUTTON_3; - break; - } - mouseState &= ~buttonState; - KdEnqueuePointerEvent(sdlPointer, mouseState|KD_MOUSE_DELTA, 0, 0, 0); - break; - case SDL_KEYDOWN: - case SDL_KEYUP: -#ifdef DEBUG - printf("Keycode: %d\n", event.key.keysym.scancode); -#endif - KdEnqueueKeyboardEvent (sdlKeyboard, event.key.keysym.scancode, event.type==SDL_KEYUP); - break; - - case SDL_QUIT: - /* this should never happen */ - SDL_Quit(); - } - } -} - -static int xsdlInit(void) -{ -#ifdef DEBUG - printf("Calling SDL_Init()\n"); -#endif - return SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER); -} - - -static void xsdlFini(void) -{ - SDL_Quit(); -} - -KdOsFuncs sdlOsFuncs={ - .Init = xsdlInit, - .Fini = xsdlFini, - .pollEvents = sdlTimer, -}; - -void OsVendorInit (void) -{ - KdOsInit (&sdlOsFuncs); -} - - diff --git a/xorg-server/hw/kdrive/src/Makefile.in b/xorg-server/hw/kdrive/src/Makefile.in index 889bb6afa..ff33a07df 100644 --- a/xorg-server/hw/kdrive/src/Makefile.in +++ b/xorg-server/hw/kdrive/src/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -130,7 +129,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -154,6 +152,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -171,8 +170,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -218,7 +215,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -244,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -253,7 +250,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -267,7 +263,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -309,8 +304,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -353,6 +346,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -384,7 +378,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index fb8ebd076..65fc75a54 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -898,11 +898,11 @@ KdNewKeyboard (void) ki->bellDuration = 200; ki->next = NULL; ki->options = NULL; - ki->xkbRules = strdup("base"); - ki->xkbModel = strdup("pc105"); - ki->xkbLayout = strdup("us"); - ki->xkbVariant = NULL; - ki->xkbOptions = NULL; + ki->xkbRules = strdup(XKB_DFLT_RULES); + ki->xkbModel = strdup(XKB_DFLT_MODEL); + ki->xkbLayout = strdup(XKB_DFLT_LAYOUT); + ki->xkbVariant = strdup(XKB_DFLT_VARIANT); + ki->xkbOptions = strdup(XKB_DFLT_OPTIONS); return ki; } diff --git a/xorg-server/hw/vfb/Makefile.in b/xorg-server/hw/vfb/Makefile.in index 295ebf6b9..2821f63ba 100644 --- a/xorg-server/hw/vfb/Makefile.in +++ b/xorg-server/hw/vfb/Makefile.in @@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -142,7 +142,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -167,7 +166,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -191,6 +189,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -208,8 +207,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -255,7 +252,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -281,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -290,7 +287,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -304,7 +300,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -346,8 +341,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -395,6 +388,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -426,7 +420,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -922,10 +915,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): -rm -f $@ diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in index 1f14b0ac0..3bc1b00ed 100644 --- a/xorg-server/hw/xfree86/Makefile.in +++ b/xorg-server/hw/xfree86/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -155,7 +155,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -180,7 +179,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -204,6 +202,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -221,8 +220,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -268,7 +265,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -294,6 +290,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -303,7 +300,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -317,7 +313,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -359,8 +354,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -403,6 +396,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -434,7 +428,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -987,10 +980,10 @@ uninstall-am: uninstall-binPROGRAMS .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ libxorg.c xorg.c: touch $@ diff --git a/xorg-server/hw/xfree86/common/Makefile.in b/xorg-server/hw/xfree86/common/Makefile.in index 6abdf4261..e5922f09c 100644 --- a/xorg-server/hw/xfree86/common/Makefile.in +++ b/xorg-server/hw/xfree86/common/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -147,7 +147,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -172,7 +171,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -196,6 +194,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -213,8 +212,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -260,7 +257,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -286,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -295,7 +292,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -309,7 +305,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -351,8 +346,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -395,6 +388,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -426,7 +420,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c index bce5aae58..3b7828a3f 100644 --- a/xorg-server/hw/xfree86/common/xf86Configure.c +++ b/xorg-server/hw/xfree86/common/xf86Configure.c @@ -253,7 +253,7 @@ configureInputSection (void) int fd; #ifdef WSCONS_SUPPORT fd = open("/dev/wsmouse", 0); - if (fd > 0) { + if (fd >= 0) { DFLT_MOUSE_DEV = "/dev/wsmouse"; DFLT_MOUSE_PROTO = "wsmouse"; close(fd); diff --git a/xorg-server/hw/xfree86/ddc/Makefile.in b/xorg-server/hw/xfree86/ddc/Makefile.in index ccaebbb9f..fb63c69b8 100644 --- a/xorg-server/hw/xfree86/ddc/Makefile.in +++ b/xorg-server/hw/xfree86/ddc/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -269,7 +266,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -283,7 +279,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -369,6 +362,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -400,7 +394,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.in b/xorg-server/hw/xfree86/dixmods/Makefile.in index 6d12d31ec..39e093237 100644 --- a/xorg-server/hw/xfree86/dixmods/Makefile.in +++ b/xorg-server/hw/xfree86/dixmods/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -209,7 +209,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -234,7 +233,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -258,6 +256,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -275,8 +274,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -322,7 +319,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -348,6 +344,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -357,7 +354,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -371,7 +367,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -413,8 +408,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -457,6 +450,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -488,7 +482,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in index 64fac12d9..70acef6f7 100644 --- a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in +++ b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -277,7 +274,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -291,7 +287,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -377,6 +370,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -408,7 +402,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/doc/Makefile.in b/xorg-server/hw/xfree86/doc/Makefile.in index 75cd02557..06ac44067 100644 --- a/xorg-server/hw/xfree86/doc/Makefile.in +++ b/xorg-server/hw/xfree86/doc/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -134,7 +133,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -158,6 +156,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -175,8 +174,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -222,7 +219,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -248,6 +244,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -257,7 +254,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -271,7 +267,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -313,8 +308,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -357,6 +350,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -388,7 +382,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/doc/devel/Makefile.in b/xorg-server/hw/xfree86/doc/devel/Makefile.in index 17a586fc2..5b1dabe78 100644 --- a/xorg-server/hw/xfree86/doc/devel/Makefile.in +++ b/xorg-server/hw/xfree86/doc/devel/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -72,7 +72,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -97,7 +96,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -121,6 +119,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -138,8 +137,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -185,7 +182,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -211,6 +207,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -220,7 +217,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -234,7 +230,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -276,8 +271,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -320,6 +313,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -351,7 +345,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.in b/xorg-server/hw/xfree86/doc/man/Makefile.in index cc86ddb7a..7693cb6d4 100644 --- a/xorg-server/hw/xfree86/doc/man/Makefile.in +++ b/xorg-server/hw/xfree86/doc/man/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -246,7 +243,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -260,7 +256,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -346,6 +339,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -377,7 +371,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -672,10 +665,10 @@ xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man $(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX) .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ # 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. diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.am b/xorg-server/hw/xfree86/doc/sgml/Makefile.am index d2c821c03..09b64f7b0 100644 --- a/xorg-server/hw/xfree86/doc/sgml/Makefile.am +++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.am @@ -33,19 +33,19 @@ SUFFIXES = .sgml .txt .html .ps .pdf .sgml.txt: @rm -f $@ - $(MAKE_TEXT) $< + $(AM_V_GEN)$(MAKE_TEXT) $< .sgml.ps: @rm -f $@ - $(MAKE_PS) $< + $(AM_V_GEN)$(MAKE_PS) $< .ps.pdf: @rm -f $@ - $(MAKE_PDF) $< + $(AM_V_GEN)$(MAKE_PDF) $< .sgml.html: @rm -f $@ - $(MAKE_HTML) $< + $(AM_V_GEN)$(MAKE_HTML) $< noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.in b/xorg-server/hw/xfree86/doc/sgml/Makefile.in index 200466a1b..d203a07f4 100644 --- a/xorg-server/hw/xfree86/doc/sgml/Makefile.in +++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.in @@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -92,7 +92,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -117,7 +116,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -141,6 +139,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -158,8 +157,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -205,7 +202,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -231,6 +227,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -240,7 +237,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -254,7 +250,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -296,8 +291,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -340,6 +333,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -371,7 +365,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -577,19 +570,19 @@ uninstall-am: @BUILD_LINUXDOC_TRUE@.sgml.txt: @BUILD_LINUXDOC_TRUE@ @rm -f $@ -@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) $< +@BUILD_LINUXDOC_TRUE@ $(AM_V_GEN)$(MAKE_TEXT) $< @BUILD_LINUXDOC_TRUE@.sgml.ps: @BUILD_LINUXDOC_TRUE@ @rm -f $@ -@BUILD_LINUXDOC_TRUE@ $(MAKE_PS) $< +@BUILD_LINUXDOC_TRUE@ $(AM_V_GEN)$(MAKE_PS) $< @BUILD_LINUXDOC_TRUE@.ps.pdf: @BUILD_LINUXDOC_TRUE@ @rm -f $@ -@BUILD_LINUXDOC_TRUE@ $(MAKE_PDF) $< +@BUILD_LINUXDOC_TRUE@ $(AM_V_GEN)$(MAKE_PDF) $< @BUILD_LINUXDOC_TRUE@.sgml.html: @BUILD_LINUXDOC_TRUE@ @rm -f $@ -@BUILD_LINUXDOC_TRUE@ $(MAKE_HTML) $< +@BUILD_LINUXDOC_TRUE@ $(AM_V_GEN)$(MAKE_HTML) $< # 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. diff --git a/xorg-server/hw/xfree86/dri/Makefile.in b/xorg-server/hw/xfree86/dri/Makefile.in index 3d8591e98..316c4966e 100644 --- a/xorg-server/hw/xfree86/dri/Makefile.in +++ b/xorg-server/hw/xfree86/dri/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -272,7 +269,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -286,7 +282,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -372,6 +365,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -403,7 +397,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c index faddfe6ec..0de9be621 100644 --- a/xorg-server/hw/xfree86/dri/dri.c +++ b/xorg-server/hw/xfree86/dri/dri.c @@ -1277,7 +1277,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable, /* track this in case the client dies */ AddResource(FakeClientID(client->index), DRIDrawablePrivResType, - (pointer)pDrawable->id); + (pointer)(intptr_t)pDrawable->id); if (pDRIDrawablePriv->hwDrawable) { drmUpdateDrawableInfo(pDRIPriv->drmFD, @@ -1348,7 +1348,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) if (pDrawable->type == DRAWABLE_WINDOW) { LookupClientResourceComplex(client, DRIDrawablePrivResType, DRIDestroyDrawableCB, - (pointer)pDrawable->id); + (pointer)(intptr_t)pDrawable->id); } else { /* pixmap (or for GLX 1.3, a PBuffer) */ /* NOT_DONE */ @@ -1364,7 +1364,9 @@ DRIDrawablePrivDelete(pointer pResource, XID id) WindowPtr pWin; int rc; - id = (XID)pResource; + /* For DRIDrawablePrivResType, the XID is the client's fake ID. The + * important XID is the value in pResource. */ + id = (XID)(intptr_t)pResource; rc = dixLookupWindow(&pWin, id, serverClient, DixGetAttrAccess); if (rc == Success) { diff --git a/xorg-server/hw/xfree86/dri2/Makefile.in b/xorg-server/hw/xfree86/dri2/Makefile.in index 8005471f8..36308e660 100644 --- a/xorg-server/hw/xfree86/dri2/Makefile.in +++ b/xorg-server/hw/xfree86/dri2/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -271,7 +268,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -285,7 +281,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -371,6 +364,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -402,7 +396,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/exa/Makefile.in b/xorg-server/hw/xfree86/exa/Makefile.in index 24b42048b..f91bfad36 100644 --- a/xorg-server/hw/xfree86/exa/Makefile.in +++ b/xorg-server/hw/xfree86/exa/Makefile.in @@ -47,7 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -127,7 +127,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -152,7 +151,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -176,6 +174,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -193,8 +192,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -240,7 +237,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -266,6 +262,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -275,7 +272,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -289,7 +285,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -331,8 +326,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -375,6 +368,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -406,7 +400,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -799,10 +792,10 @@ uninstall-am: uninstall-drivermanDATA uninstall-moduleLTLIBRARIES .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ exa.$(DRIVER_MAN_SUFFIX): exa.man -rm -f exa.$(DRIVER_MAN_SUFFIX) diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.in b/xorg-server/hw/xfree86/fbdevhw/Makefile.in index 9bb2082c8..d1c271e18 100644 --- a/xorg-server/hw/xfree86/fbdevhw/Makefile.in +++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -132,7 +132,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -157,7 +156,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -181,6 +179,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -198,8 +197,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -245,7 +242,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -271,6 +267,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -280,7 +277,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -294,7 +290,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -336,8 +331,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -380,6 +373,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -411,7 +405,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -822,10 +815,10 @@ uninstall-am: uninstall-drivermanDATA uninstall-linuxmoduleLTLIBRARIES \ .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man -rm -f fbdevhw.$(DRIVER_MAN_SUFFIX) diff --git a/xorg-server/hw/xfree86/i2c/Makefile.in b/xorg-server/hw/xfree86/i2c/Makefile.in index 5c636f882..6bbc50746 100644 --- a/xorg-server/hw/xfree86/i2c/Makefile.in +++ b/xorg-server/hw/xfree86/i2c/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -173,7 +173,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -198,7 +197,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -222,6 +220,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -239,8 +238,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -286,7 +283,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -312,6 +308,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -321,7 +318,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -335,7 +331,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -377,8 +372,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -421,6 +414,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -452,7 +446,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/int10/Makefile.in b/xorg-server/hw/xfree86/int10/Makefile.in index ac177a0f2..2a587eb91 100644 --- a/xorg-server/hw/xfree86/int10/Makefile.in +++ b/xorg-server/hw/xfree86/int10/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -137,7 +137,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -162,7 +161,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -186,6 +184,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -203,8 +202,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -250,7 +247,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -276,6 +272,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -285,7 +282,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -299,7 +295,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -341,8 +336,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -385,6 +378,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -416,7 +410,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in index badd676ab..875fd7b9d 100644 --- a/xorg-server/hw/xfree86/loader/Makefile.in +++ b/xorg-server/hw/xfree86/loader/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -244,7 +241,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -258,7 +254,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -344,6 +337,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -375,7 +369,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c index 12af6b72e..37c8b641c 100644 --- a/xorg-server/hw/xfree86/loader/sdksyms.c +++ b/xorg-server/hw/xfree86/loader/sdksyms.c @@ -653,7 +653,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &SendErrorToClient, (void *) &MarkClientException, (void *) &CreateConnectionBlock, - (void *) &CopyISOLatin1Lowered, (void *) &CompareISOLatin1Lowered, (void *) &dixLookupWindow, (void *) &dixLookupDrawable, @@ -1053,7 +1052,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &noResExtension, (void *) &noXFree86DGAExtension, (void *) &noXFree86DRIExtension, - (void *) &noXFree86VidModeExtension, (void *) &noXFixesExtension, (void *) &noPanoramiXExtension, (void *) &noXvExtension, @@ -1568,8 +1566,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &DMTModes, (void *) &xf86ConfigFile, (void *) &xf86AllowMouseOpenFail, - (void *) &xf86VidModeDisabled, - (void *) &xf86VidModeAllowNonLocal, (void *) &xf86fpFlag, (void *) &xf86sFlag, (void *) &xf86bsEnableFlag, diff --git a/xorg-server/hw/xfree86/modes/Makefile.in b/xorg-server/hw/xfree86/modes/Makefile.in index c25014756..54a956297 100644 --- a/xorg-server/hw/xfree86/modes/Makefile.in +++ b/xorg-server/hw/xfree86/modes/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -127,7 +127,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -152,7 +151,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -176,6 +174,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -193,8 +192,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -240,7 +237,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -266,6 +262,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -275,7 +272,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -289,7 +285,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -331,8 +326,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -375,6 +368,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -406,7 +400,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/Makefile.in b/xorg-server/hw/xfree86/os-support/Makefile.in index 304aaef80..d8b82872e 100644 --- a/xorg-server/hw/xfree86/os-support/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -158,7 +158,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -183,7 +182,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -207,6 +205,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -224,8 +223,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -271,7 +268,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -297,6 +293,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -306,7 +303,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -320,7 +316,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -362,8 +357,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -406,6 +399,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -437,7 +431,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in index b73bfa0cb..6f7253292 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -269,7 +266,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -283,7 +279,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -369,6 +362,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -400,7 +394,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/bus/Makefile.in b/xorg-server/hw/xfree86/os-support/bus/Makefile.in index fd9dd926b..94b80c45f 100644 --- a/xorg-server/hw/xfree86/os-support/bus/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/bus/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -277,7 +274,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -291,7 +287,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -377,6 +370,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -408,7 +402,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/bus/linuxPci.c b/xorg-server/hw/xfree86/os-support/bus/linuxPci.c index 920a14949..289315ebc 100644 --- a/xorg-server/hw/xfree86/os-support/bus/linuxPci.c +++ b/xorg-server/hw/xfree86/os-support/bus/linuxPci.c @@ -445,7 +445,7 @@ xf86MapLegacyIO(struct pci_device *dev) PCIIOC_MMAP_IS_IO); } else { /* legacy_io file exists, encode fd */ - DomainMmappedIO[domain] = (pointer)(fd << 24); + DomainMmappedIO[domain] = (pointer)(intptr_t)(fd << 24); } } diff --git a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in index 8eb1562e0..cebfcce13 100644 --- a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,7 +97,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -122,7 +121,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -146,6 +144,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -163,8 +162,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -210,7 +207,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -236,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -245,7 +242,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -259,7 +255,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -301,8 +296,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -345,6 +338,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -376,7 +370,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/linux/Makefile.in b/xorg-server/hw/xfree86/os-support/linux/Makefile.in index 0433483bd..0dc41eded 100644 --- a/xorg-server/hw/xfree86/os-support/linux/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/linux/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -270,7 +267,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -284,7 +280,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -370,6 +363,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -401,7 +395,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c index 73409dfba..09d178797 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c @@ -336,7 +336,7 @@ mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr) { struct mtrr_wc_region *p, *prev; - if (mtrr_fd > 0) { + if (mtrr_fd >= 0) { p = wcr; while (p) { if (p->added) diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.in b/xorg-server/hw/xfree86/os-support/misc/Makefile.in index 0b74a8902..0b4a50f57 100644 --- a/xorg-server/hw/xfree86/os-support/misc/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -243,7 +240,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -257,7 +253,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -343,6 +336,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -374,7 +368,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/sco/Makefile.in b/xorg-server/hw/xfree86/os-support/sco/Makefile.in index 8c836c7d8..b49eeb366 100644 --- a/xorg-server/hw/xfree86/os-support/sco/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/sco/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -69,7 +69,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -94,7 +93,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -118,6 +116,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -135,8 +134,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -182,7 +179,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -208,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -217,7 +214,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -231,7 +227,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -273,8 +268,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -317,6 +310,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -348,7 +342,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in index ca606a9be..997ef12b7 100644 --- a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -144,7 +144,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -169,7 +168,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -193,6 +191,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -210,8 +209,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -257,7 +254,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -283,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -292,7 +289,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -306,7 +302,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -348,8 +343,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -392,6 +385,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -423,7 +417,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in index d7b56737a..26d88d168 100644 --- a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in +++ b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -69,7 +69,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -94,7 +93,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -118,6 +116,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -135,8 +134,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -182,7 +179,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -208,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -217,7 +214,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -231,7 +227,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -273,8 +268,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -317,6 +310,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -348,7 +342,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/parser/Makefile.in b/xorg-server/hw/xfree86/parser/Makefile.in index 865a7b029..7db26df1d 100644 --- a/xorg-server/hw/xfree86/parser/Makefile.in +++ b/xorg-server/hw/xfree86/parser/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -152,7 +152,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -177,7 +176,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -201,6 +199,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -218,8 +217,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -265,7 +262,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -291,6 +287,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -300,7 +297,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -314,7 +310,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -356,8 +351,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -400,6 +393,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -431,7 +425,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/ramdac/Makefile.in b/xorg-server/hw/xfree86/ramdac/Makefile.in index 59e180c7c..3dfddd330 100644 --- a/xorg-server/hw/xfree86/ramdac/Makefile.in +++ b/xorg-server/hw/xfree86/ramdac/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -269,7 +266,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -283,7 +279,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -369,6 +362,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -400,7 +394,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/shadowfb/Makefile.in b/xorg-server/hw/xfree86/shadowfb/Makefile.in index df1481fb3..0a4bed446 100644 --- a/xorg-server/hw/xfree86/shadowfb/Makefile.in +++ b/xorg-server/hw/xfree86/shadowfb/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -272,7 +269,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -286,7 +282,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -372,6 +365,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -403,7 +397,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/utils/Makefile.in b/xorg-server/hw/xfree86/utils/Makefile.in index 43c08c662..60d168bbd 100644 --- a/xorg-server/hw/xfree86/utils/Makefile.in +++ b/xorg-server/hw/xfree86/utils/Makefile.in @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -134,7 +133,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -158,6 +156,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -175,8 +174,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -222,7 +219,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -248,6 +244,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -257,7 +254,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -271,7 +267,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -313,8 +308,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -357,6 +350,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -388,7 +382,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/utils/cvt/Makefile.in b/xorg-server/hw/xfree86/utils/cvt/Makefile.in index 3ee5f1073..fdc6f0711 100644 --- a/xorg-server/hw/xfree86/utils/cvt/Makefile.in +++ b/xorg-server/hw/xfree86/utils/cvt/Makefile.in @@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -157,7 +157,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -182,7 +181,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -206,6 +204,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -223,8 +222,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -270,7 +267,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -296,6 +292,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -305,7 +302,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -319,7 +315,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -361,8 +356,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -405,6 +398,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -436,7 +430,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -896,10 +889,10 @@ uninstall-man: uninstall-man1 .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ # 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. diff --git a/xorg-server/hw/xfree86/utils/gtf/Makefile.in b/xorg-server/hw/xfree86/utils/gtf/Makefile.in index c54bdb20e..eab692b27 100644 --- a/xorg-server/hw/xfree86/utils/gtf/Makefile.in +++ b/xorg-server/hw/xfree86/utils/gtf/Makefile.in @@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -156,7 +156,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -181,7 +180,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -205,6 +203,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -222,8 +221,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -269,7 +266,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -295,6 +291,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -304,7 +301,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -318,7 +314,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -360,8 +355,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -404,6 +397,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -435,7 +429,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -851,10 +844,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): -rm -f $@ diff --git a/xorg-server/hw/xfree86/vbe/Makefile.in b/xorg-server/hw/xfree86/vbe/Makefile.in index 5e7319adb..f8b15d129 100644 --- a/xorg-server/hw/xfree86/vbe/Makefile.in +++ b/xorg-server/hw/xfree86/vbe/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -271,7 +268,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -285,7 +281,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -371,6 +364,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -402,7 +396,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/vgahw/Makefile.in b/xorg-server/hw/xfree86/vgahw/Makefile.in index 9f7f702a7..85ac974bb 100644 --- a/xorg-server/hw/xfree86/vgahw/Makefile.in +++ b/xorg-server/hw/xfree86/vgahw/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -271,7 +268,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -285,7 +281,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -371,6 +364,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -402,7 +396,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.in b/xorg-server/hw/xfree86/x86emu/Makefile.in index 90d9ab8bd..d9a4025a4 100644 --- a/xorg-server/hw/xfree86/x86emu/Makefile.in +++ b/xorg-server/hw/xfree86/x86emu/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -244,7 +241,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -258,7 +254,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -344,6 +337,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -375,7 +369,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/xaa/Makefile.in b/xorg-server/hw/xfree86/xaa/Makefile.in index 2404c9433..dfeb05aa0 100644 --- a/xorg-server/hw/xfree86/xaa/Makefile.in +++ b/xorg-server/hw/xfree86/xaa/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -143,7 +143,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -168,7 +167,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -192,6 +190,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -209,8 +208,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -256,7 +253,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -282,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -291,7 +288,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -305,7 +301,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -347,8 +342,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -391,6 +384,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -422,7 +416,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in index 4b618a04f..d3527f0f1 100644 --- a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in +++ b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -272,7 +269,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -286,7 +282,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -372,6 +365,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -403,7 +397,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xnest/Makefile.in b/xorg-server/hw/xnest/Makefile.in index bc8634e14..d165552eb 100644 --- a/xorg-server/hw/xnest/Makefile.in +++ b/xorg-server/hw/xnest/Makefile.in @@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -145,7 +145,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -170,7 +169,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -194,6 +192,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -211,8 +210,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -258,7 +255,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -284,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -293,7 +290,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -307,7 +303,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -352,8 +347,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -396,6 +389,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -427,7 +421,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -980,10 +973,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): -rm -f $@ diff --git a/xorg-server/hw/xquartz/GL/Makefile.in b/xorg-server/hw/xquartz/GL/Makefile.in index 6b6127403..053785602 100644 --- a/xorg-server/hw/xquartz/GL/Makefile.in +++ b/xorg-server/hw/xquartz/GL/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -244,7 +241,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -258,7 +254,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -344,6 +337,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -375,7 +369,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xquartz/Makefile.in b/xorg-server/hw/xquartz/Makefile.in index 9864293f7..1fe3358ba 100644 --- a/xorg-server/hw/xquartz/Makefile.in +++ b/xorg-server/hw/xquartz/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -149,7 +149,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -174,7 +173,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -198,6 +196,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -215,8 +214,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -262,7 +259,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -288,6 +284,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -297,7 +294,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -311,7 +307,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -353,8 +348,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -397,6 +390,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -428,7 +422,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m index d8d23ec2f..119154764 100644 --- a/xorg-server/hw/xquartz/X11Controller.m +++ b/xorg-server/hw/xquartz/X11Controller.m @@ -52,8 +52,6 @@ #include #include -BOOL xquartz_resetenv_display = NO; - @implementation X11Controller - (void) awakeFromNib @@ -353,7 +351,7 @@ BOOL xquartz_resetenv_display = NO; newargv[3] = NULL; s = getenv("DISPLAY"); - if (xquartz_resetenv_display || s == NULL || s[0] == 0) { + if (s == NULL || s[0] == 0) { snprintf(buf, sizeof(buf), ":%s", display); setenv("DISPLAY", buf, TRUE); } diff --git a/xorg-server/hw/xquartz/bundle/Makefile.in b/xorg-server/hw/xquartz/bundle/Makefile.in index fccfb7357..8452829bd 100644 --- a/xorg-server/hw/xquartz/bundle/Makefile.in +++ b/xorg-server/hw/xquartz/bundle/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -102,7 +102,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -127,7 +126,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -151,6 +149,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -168,8 +167,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -215,7 +212,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -241,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -250,7 +247,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -264,7 +260,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -306,8 +301,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -350,6 +343,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -381,7 +375,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xquartz/doc/Makefile.in b/xorg-server/hw/xquartz/doc/Makefile.in index 1c2540fbc..b09afa813 100644 --- a/xorg-server/hw/xquartz/doc/Makefile.in +++ b/xorg-server/hw/xquartz/doc/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -246,7 +243,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -260,7 +256,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -346,6 +339,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -377,7 +371,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -641,10 +634,10 @@ uninstall-am: uninstall-appmanDATA .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): cp $< $@ diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.in b/xorg-server/hw/xquartz/mach-startup/Makefile.in index 47d174c19..a379c10d4 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.in +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -133,7 +133,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -158,7 +157,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -182,6 +180,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -199,8 +198,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -246,7 +243,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -272,6 +268,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -281,7 +278,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -295,7 +291,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -337,8 +332,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -381,6 +374,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -412,7 +406,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c index 146ea11d8..640a91f23 100644 --- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c +++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c @@ -62,8 +62,6 @@ void DarwinListenOnOpenFD(int fd); extern int noPanoramiXExtension; -extern int xquartz_resetenv_display; - #define DEFAULT_CLIENT X11BINDIR "/xterm" #define DEFAULT_STARTX X11BINDIR "/startx" #define DEFAULT_SHELL "/bin/sh" @@ -302,6 +300,7 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename) handoff_data->fd = create_socket(handoff_data->filename); if(!handoff_data->fd) { + free(handoff_data); return KERN_FAILURE; } @@ -429,9 +428,6 @@ static int startup_trigger(int argc, char **argv, char **envp) { if((s = getenv("DISPLAY"))) { fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n", s); unsetenv("DISPLAY"); - - /* This tells X11Controller to not use the environment's DISPLAY and reset it based on the server's display */ - xquartz_resetenv_display = 1; } else { fprintf(stderr, "X11.app: Could not connect to server (DISPLAY is not set). Starting X server.\n"); } diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.in b/xorg-server/hw/xquartz/pbproxy/Makefile.in index 5243f4934..e55b81c0f 100644 --- a/xorg-server/hw/xquartz/pbproxy/Makefile.in +++ b/xorg-server/hw/xquartz/pbproxy/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -145,7 +144,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -169,6 +167,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -186,8 +185,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -233,7 +230,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -259,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -268,7 +265,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -282,7 +278,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -324,8 +319,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -368,6 +361,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -399,7 +393,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xquartz/xpr/Makefile.in b/xorg-server/hw/xquartz/xpr/Makefile.in index f0054fb37..41d640834 100644 --- a/xorg-server/hw/xquartz/xpr/Makefile.in +++ b/xorg-server/hw/xquartz/xpr/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,7 +97,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -122,7 +121,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -146,6 +144,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -163,8 +162,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -210,7 +207,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -236,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -245,7 +242,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -259,7 +255,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -301,8 +296,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -345,6 +338,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -376,7 +370,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index 2c7972a7f..a76b56957 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -196,7 +196,6 @@ EXTRA_DIST = \ $(GLX_EXTRAS) \ $(MAN_SRCS) \ _usr_X11R6_lib_X11_system.XWinrc \ - X-boxed.ico \ X.ico \ XWin.rc \ xlaunch/config.cc \ diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in index 4abd2661a..59c383f89 100644 --- a/xorg-server/hw/xwin/Makefile.in +++ b/xorg-server/hw/xwin/Makefile.in @@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -212,7 +212,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -237,7 +236,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -269,6 +267,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -286,8 +285,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -333,7 +330,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -359,6 +355,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -368,7 +365,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -382,7 +378,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -424,8 +419,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -468,6 +461,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -499,7 +493,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -689,7 +682,6 @@ EXTRA_DIST = \ $(GLX_EXTRAS) \ $(MAN_SRCS) \ _usr_X11R6_lib_X11_system.XWinrc \ - X-boxed.ico \ X.ico \ XWin.rc \ xlaunch/config.cc \ @@ -1235,10 +1227,10 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man $(LN_S) XWinrc.man XWinrc.$(FILE_MAN_SUFFIX) .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.pre.man: - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ relink: rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT) diff --git a/xorg-server/hw/xwin/X-boxed.ico b/xorg-server/hw/xwin/X-boxed.ico deleted file mode 100644 index 072704253..000000000 Binary files a/xorg-server/hw/xwin/X-boxed.ico and /dev/null differ diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 29c6f1ccf..df2664dca 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -106,4 +106,3 @@ END */ IDI_XWIN ICON "X.ico" -IDI_XWIN_BOXED ICON "X-boxed.ico" diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index b537d3213..99eb6b8d2 100644 --- a/xorg-server/hw/xwin/winmouse.c +++ b/xorg-server/hw/xwin/winmouse.c @@ -371,16 +371,15 @@ winMouseButtonsHandle (ScreenPtr pScreen, */ void winEnqueueMotion(int x, int y) { - miPointerSetPosition(g_pwinPointer, &x, &y); - int i, nevents; int valuators[2]; - EventListPtr events; - GetEventList(&events); + miPointerSetPosition(g_pwinPointer, &x, &y); valuators[0] = x; valuators[1] = y; + + GetEventList(&events); nevents = GetPointerEvents(events, g_pwinPointer, MotionNotify, 0, POINTER_ABSOLUTE, 0, 2, valuators); diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c index e16b2a3c8..9f46a64d9 100644 --- a/xorg-server/hw/xwin/winmultiwindowicons.c +++ b/xorg-server/hw/xwin/winmultiwindowicons.c @@ -543,33 +543,34 @@ winUpdateIcon (Window id) HICON hIcon, hIconSmall=NULL, hIconOld; pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW); - if (!pWin) return; - winWindowPriv(pWin); - if (pWinPriv->hWnd) { - hIcon = winOverrideIcon ((unsigned long)pWin); - if (!hIcon) { - hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON)); - if (!hIcon) { - hIcon = g_hIconX; - hIconSmall = g_hSmallIconX; - } else { - /* Leave undefined if not found */ - hIconSmall = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON)); + if (pWin) + { + winWindowPriv(pWin); + if (pWinPriv->hWnd) { + hIcon = winOverrideIcon ((unsigned long)pWin); + if (!hIcon) { + hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON)); + if (!hIcon) { + hIcon = g_hIconX; + hIconSmall = g_hSmallIconX; + } else { + /* Leave undefined if not found */ + hIconSmall = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON)); + } + } + + /* Set the large icon */ + hIconOld = (HICON) SendMessage (pWinPriv->hWnd, + WM_SETICON, ICON_BIG, (LPARAM) hIcon); + + /* Delete the icon if its not the default */ + winDestroyIcon(hIconOld); + + /* Same for the small icon */ + hIconOld = (HICON) SendMessage (pWinPriv->hWnd, + WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall); + winDestroyIcon(hIconOld); } - } - - /* Set the large icon */ - hIconOld = (HICON) SendMessage (pWinPriv->hWnd, - WM_SETICON, ICON_BIG, (LPARAM) hIcon); - - /* Delete the icon if its not the default */ - winDestroyIcon(hIconOld); - - /* Same for the small icon */ - hIconOld = (HICON) SendMessage (pWinPriv->hWnd, - WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall); - winDestroyIcon(hIconOld); - } } diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c index 543a1652f..d14ceee9c 100644 --- a/xorg-server/hw/xwin/winmultiwindowwndproc.c +++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c @@ -282,11 +282,11 @@ static void winRaiseWindow(WindowPtr pWin) if (!winInDestroyWindowsWindow && !winInRaiseWindow) { BOOL oldstate = winInRaiseWindow; + XID vlist[1] = { 0 }; winInRaiseWindow = TRUE; /* Call configure window directly to make sure it gets processed * in time */ - XID vlist[1] = { 0 }; ConfigureWindow(pWin, CWStackMode, vlist, serverClient); winInRaiseWindow = oldstate; } @@ -416,12 +416,14 @@ winTopLevelWindowProc (HWND hwnd, UINT message, winReorderWindowsMultiWindow (); /* Fix a 'round title bar corner background should be transparent not black' problem when first painted */ - RECT rWindow; - HRGN hRgnWindow; - GetWindowRect(hwnd, &rWindow); - hRgnWindow = CreateRectRgnIndirect(&rWindow); - SetWindowRgn (hwnd, hRgnWindow, TRUE); - DeleteObject(hRgnWindow); + { + RECT rWindow; + HRGN hRgnWindow; + GetWindowRect(hwnd, &rWindow); + hRgnWindow = CreateRectRgnIndirect(&rWindow); + SetWindowRgn (hwnd, hRgnWindow, TRUE); + DeleteObject(hRgnWindow); + } SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE); @@ -897,10 +899,10 @@ winTopLevelWindowProc (HWND hwnd, UINT message, } else /* It is an overridden window so make it top of Z stack */ { + HWND forHwnd = GetForegroundWindow(); #if CYGWINDOWING_DEBUG ErrorF ("overridden window is shown\n"); #endif - HWND forHwnd = GetForegroundWindow(); if (forHwnd != NULL) { if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE) diff --git a/xorg-server/hw/xwin/winprefslex.c b/xorg-server/hw/xwin/winprefslex.c index 83d7f8fa8..c55bd8310 100644 --- a/xorg-server/hw/xwin/winprefslex.c +++ b/xorg-server/hw/xwin/winprefslex.c @@ -53,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -140,7 +141,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -689,7 +698,7 @@ static char *makestr(char *str) return ptr; } -#line 693 "winprefslex.c" +#line 702 "winprefslex.c" #define INITIAL 0 @@ -770,7 +779,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -778,7 +792,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -789,7 +803,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -873,7 +887,7 @@ YY_DECL #line 66 "winprefslex.l" -#line 877 "winprefslex.c" +#line 891 "winprefslex.c" if ( !(yy_init) ) { @@ -1137,7 +1151,7 @@ YY_RULE_SETUP #line 102 "winprefslex.l" ECHO; YY_BREAK -#line 1141 "winprefslex.c" +#line 1155 "winprefslex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1904,8 +1918,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ diff --git a/xorg-server/hw/xwin/winresource.h b/xorg-server/hw/xwin/winresource.h index 5aa884030..7085117e6 100644 --- a/xorg-server/hw/xwin/winresource.h +++ b/xorg-server/hw/xwin/winresource.h @@ -37,7 +37,6 @@ #define IDC_STATIC -1 #define IDI_XWIN 101 -#define IDI_XWIN_BOXED 102 #define IDM_TRAYICON_MENU 103 #define IDC_CLIENTS_CONNECTED 104 diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c index d72a5f135..5e8451082 100644 --- a/xorg-server/hw/xwin/winwndproc.c +++ b/xorg-server/hw/xwin/winwndproc.c @@ -717,6 +717,10 @@ winWindowProc (HWND hwnd, UINT message, if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; + /* We can't do anything without g_pwinPointer */ + if (g_pwinPointer == NULL) + break; + /* Has the mouse pointer crossed screens? */ if (s_pScreen != miPointerGetScreen(g_pwinPointer)) miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen, diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in index b4a593fc0..caef87dcd 100644 --- a/xorg-server/include/Makefile.in +++ b/xorg-server/include/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -254,7 +251,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -268,7 +264,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -354,6 +347,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -385,7 +379,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index b1edb6c46..ed3acb6c4 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -173,11 +173,6 @@ extern _X_EXPORT void MarkClientException( extern _X_HIDDEN Bool CreateConnectionBlock(void); /* dixutils.c */ -extern _X_EXPORT void CopyISOLatin1Lowered( - unsigned char * /*dest*/, - unsigned char * /*source*/, - int /*length*/); - extern _X_EXPORT int CompareISOLatin1Lowered( unsigned char * /*a*/, int alen, @@ -587,8 +582,8 @@ typedef struct { extern int XItoCoreType(int xi_type); extern Bool DevHasCursor(DeviceIntPtr pDev); -extern Bool IsPointerDevice( DeviceIntPtr dev); -extern Bool IsKeyboardDevice(DeviceIntPtr dev); +extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev); +extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev); extern Bool IsPointerEvent(InternalEvent *event); extern Bool IsMaster(DeviceIntPtr dev); diff --git a/xorg-server/include/do-not-use-config.h.in b/xorg-server/include/do-not-use-config.h.in index 2093fc6db..19ca8a2a8 100644 --- a/xorg-server/include/do-not-use-config.h.in +++ b/xorg-server/include/do-not-use-config.h.in @@ -277,9 +277,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_RPCSVC_DBM_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SDL_SDL_H - /* Define to 1 if you have the header file. */ #undef HAVE_SELINUX_AVC_H @@ -451,6 +448,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -687,9 +687,6 @@ /* Build registry module */ #undef XREGISTRY -/* Build Xsdl server */ -#undef XSDLSERVER - /* Build SELinux extension */ #undef XSELINUX diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 2f6b0c06f..dad1af787 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -83,6 +83,10 @@ typedef struct _NewClientRec *NewClientPtr; #include #include +#ifdef DDXBEFORERESET +extern void ddxBeforeReset (void); +#endif + #ifdef DDXOSVERRORF extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args); #endif diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h index da9770ce3..d688c66b5 100644 --- a/xorg-server/include/protocol-versions.h +++ b/xorg-server/include/protocol-versions.h @@ -61,7 +61,7 @@ /* GLX */ #define SERVER_GLX_MAJOR_VERSION 1 -#define SERVER_GLX_MINOR_VERSION 2 +#define SERVER_GLX_MINOR_VERSION 4 /* Xinerama */ #define SERVER_PANORAMIX_MAJOR_VERSION 1 diff --git a/xorg-server/ltmain.sh b/xorg-server/ltmain.sh index 6939dcc4a..3506ead39 100644 --- a/xorg-server/ltmain.sh +++ b/xorg-server/ltmain.sh @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION="2.2.6 Debian-2.2.6a-4" TIMESTAMP="" package_revision=1.3012 @@ -5033,7 +5033,10 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5344,19 +5347,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5893,6 +5896,7 @@ func_mode_link () if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -6206,6 +6210,9 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff --git a/xorg-server/m4/libtool.m4 b/xorg-server/m4/libtool.m4 index 671cde117..1e7ea47c0 100644 --- a/xorg-server/m4/libtool.m4 +++ b/xorg-server/m4/libtool.m4 @@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu) # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu) 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 @@ -3079,7 +3088,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4431,7 +4446,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4606,6 +4621,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4844,7 +4860,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff --git a/xorg-server/m4/shave.m4 b/xorg-server/m4/shave.m4 deleted file mode 100644 index 0c2c9f5a0..000000000 --- a/xorg-server/m4/shave.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - diff --git a/xorg-server/mi/Makefile.in b/xorg-server/mi/Makefile.in index c80881c72..56ace6c4c 100644 --- a/xorg-server/mi/Makefile.in +++ b/xorg-server/mi/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -131,7 +131,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -156,7 +155,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -180,6 +178,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -197,8 +196,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -244,7 +241,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -270,6 +266,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -279,7 +276,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -293,7 +289,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -335,8 +330,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -379,6 +372,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -410,7 +404,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/miext/Makefile.in b/xorg-server/miext/Makefile.in index 0738cc7dc..fdd215968 100644 --- a/xorg-server/miext/Makefile.in +++ b/xorg-server/miext/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -111,7 +111,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -136,7 +135,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -160,6 +158,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -177,8 +176,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -224,7 +221,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -250,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -259,7 +256,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -273,7 +269,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -315,8 +310,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -359,6 +352,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -390,7 +384,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/miext/cw/Makefile.in b/xorg-server/miext/cw/Makefile.in index ae7a047c4..3cde755c8 100644 --- a/xorg-server/miext/cw/Makefile.in +++ b/xorg-server/miext/cw/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -243,7 +240,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -257,7 +253,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -343,6 +336,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -374,7 +368,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/miext/damage/Makefile.in b/xorg-server/miext/damage/Makefile.in index 9e159a7eb..a9c318766 100644 --- a/xorg-server/miext/damage/Makefile.in +++ b/xorg-server/miext/damage/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -269,7 +266,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -283,7 +279,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -369,6 +362,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -400,7 +394,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/miext/rootless/Makefile.in b/xorg-server/miext/rootless/Makefile.in index e32a59a39..0c24da9a0 100644 --- a/xorg-server/miext/rootless/Makefile.in +++ b/xorg-server/miext/rootless/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -244,7 +241,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -258,7 +254,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -344,6 +337,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -375,7 +369,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/miext/shadow/Makefile.in b/xorg-server/miext/shadow/Makefile.in index e59d58775..c709c76f5 100644 --- a/xorg-server/miext/shadow/Makefile.in +++ b/xorg-server/miext/shadow/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -126,7 +126,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -151,7 +150,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -175,6 +173,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -192,8 +191,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -239,7 +236,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -265,6 +261,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -274,7 +271,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -288,7 +284,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -330,8 +325,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -374,6 +367,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -405,7 +399,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am index 22ed1946c..a7f34a5b8 100644 --- a/xorg-server/os/Makefile.am +++ b/xorg-server/os/Makefile.am @@ -44,12 +44,12 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ if SPECIAL_DTRACE_OBJECTS # Generate dtrace object code for probes in libos & libdix dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) - $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o + $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o noinst_PROGRAMS = os.O os.O: dtrace.o $(am_libos_la_OBJECTS) - ld -r -o $@ dtrace.o .libs/*.o + $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o endif os.c: diff --git a/xorg-server/os/Makefile.in b/xorg-server/os/Makefile.in index 4a328cfe9..5e334093e 100644 --- a/xorg-server/os/Makefile.in +++ b/xorg-server/os/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -119,7 +119,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -144,7 +143,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -168,6 +166,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -185,8 +184,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -232,7 +229,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -258,6 +254,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -267,7 +264,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -281,7 +277,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -323,8 +318,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -367,6 +360,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -398,7 +392,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -738,10 +731,10 @@ uninstall-am: # Generate dtrace object code for probes in libos & libdix @SPECIAL_DTRACE_OBJECTS_TRUE@dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) -@SPECIAL_DTRACE_OBJECTS_TRUE@ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o +@SPECIAL_DTRACE_OBJECTS_TRUE@ $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o @SPECIAL_DTRACE_OBJECTS_TRUE@os.O: dtrace.o $(am_libos_la_OBJECTS) -@SPECIAL_DTRACE_OBJECTS_TRUE@ ld -r -o $@ dtrace.o .libs/*.o +@SPECIAL_DTRACE_OBJECTS_TRUE@ $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o os.c: touch $@ diff --git a/xorg-server/os/backtrace.c b/xorg-server/os/backtrace.c index a421140fb..dafb9904b 100644 --- a/xorg-server/os/backtrace.c +++ b/xorg-server/os/backtrace.c @@ -38,7 +38,7 @@ void xorg_backtrace(void) { void *array[64]; - char *mod; + const char *mod; int size, i; Dl_info info; ErrorF("\nBacktrace:\n"); @@ -48,10 +48,10 @@ void xorg_backtrace(void) mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)"; if (info.dli_saddr) ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod, - info.dli_sname, array[i] - info.dli_saddr, array[i]); + info.dli_sname, (char *) array[i] - (char *) info.dli_saddr, array[i]); else ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod, - info.dli_fbase, array[i] - info.dli_fbase, array[i]); + info.dli_fbase, (char *) array[i] - (char *) info.dli_fbase, array[i]); } } diff --git a/xorg-server/randr/Makefile.in b/xorg-server/randr/Makefile.in index c2d72b4ee..3954eade6 100644 --- a/xorg-server/randr/Makefile.in +++ b/xorg-server/randr/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -130,7 +130,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -155,7 +154,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -179,6 +177,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -196,8 +195,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -243,7 +240,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -269,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -278,7 +275,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -292,7 +288,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -334,8 +329,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -378,6 +371,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -409,7 +403,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/record/Makefile.in b/xorg-server/record/Makefile.in index 3773a7d2c..596af6f1b 100644 --- a/xorg-server/record/Makefile.in +++ b/xorg-server/record/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -243,7 +240,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -257,7 +253,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -343,6 +336,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -374,7 +368,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/render/Makefile.in b/xorg-server/render/Makefile.in index e0ec573c7..1f202a601 100644 --- a/xorg-server/render/Makefile.in +++ b/xorg-server/render/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -272,7 +269,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -286,7 +282,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -372,6 +365,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -403,7 +397,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/shave-libtool.in b/xorg-server/shave-libtool.in deleted file mode 100644 index f19a69e20..000000000 --- a/xorg-server/shave-libtool.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the real libtool to use -LIBTOOL="$1 --tag=CC" -shift - -# if 1, don't print anything, the underlaying wrapper will do it -pass_though=0 - -# scan the arguments, keep the right ones for libtool, and discover the mode -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - preserved_args="$preserved_args $opt" - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -case "$mode" in -compile) - # shave will be called and print the actual CC/CXX/LINK line - preserved_args="$preserved_args --shave-mode=$mode" - pass_though=1 - ;; -link) - preserved_args="$preserved_args --shave-mode=$mode" - Q=" LINK " - ;; -*) - # let's u - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_though -eq 0; then - echo "$Q$output" - fi - $LIBTOOL --silent $preserved_args -else - echo $LIBTOOL $preserved_args - $LIBTOOL $preserved_args -fi diff --git a/xorg-server/shave.in b/xorg-server/shave.in deleted file mode 100644 index 809d606af..000000000 --- a/xorg-server/shave.in +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the tool to wrap (cc, cxx, ar, ranlib, ..) -tool="$1" -shift - -# the reel tool (to call) -REEL_TOOL="$1" -shift - -pass_through=0 -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --shave-mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - # hack for configure. configure calls $CC -print-prog-name=ld to get - # the linker. Without this bit here, the output can't be parsed and - # configure thinks there's no valid linker installed. - -print-prog-name=*) - mode="find-ld" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -# mode=link is handled in the libtool wrapper -case "$mode,$tool" in -link,*) - pass_through=1 - ;; -find-ld,*) - pass_through=1 - ;; -*,cxx) - Q=" CXX " - ;; -*,cc) - Q=" CC " - ;; -*,fc) - Q=" FC " - ;; -*,f77) - Q=" F77 " - ;; -*,*) - # should not happen - Q=" CC " - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_through -eq 0; then - echo "$Q$output" - fi - $REEL_TOOL $preserved_args -else - echo $REEL_TOOL $preserved_args - $REEL_TOOL $preserved_args -fi diff --git a/xorg-server/test/Makefile.in b/xorg-server/test/Makefile.in index 0bbf6ade6..34b578331 100644 --- a/xorg-server/test/Makefile.in +++ b/xorg-server/test/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -166,7 +166,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -191,7 +190,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -215,6 +213,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -232,8 +231,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -279,7 +276,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -305,6 +301,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -314,7 +311,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -328,7 +324,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -370,8 +365,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -414,6 +407,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -445,7 +439,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/test/xi2/Makefile.in b/xorg-server/test/xi2/Makefile.in index 93e53efc6..d6a09e8a7 100644 --- a/xorg-server/test/xi2/Makefile.in +++ b/xorg-server/test/xi2/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -233,7 +233,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -258,7 +257,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -282,6 +280,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -299,8 +298,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -346,7 +343,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -372,6 +368,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -381,7 +378,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -395,7 +391,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -437,8 +432,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -481,6 +474,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -512,7 +506,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/xfixes/Makefile.in b/xorg-server/xfixes/Makefile.in index ba6e2fdfe..7fc598330 100644 --- a/xorg-server/xfixes/Makefile.in +++ b/xorg-server/xfixes/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -270,7 +267,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -284,7 +280,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -370,6 +363,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -401,7 +395,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ diff --git a/xorg-server/xkb/Makefile.am b/xorg-server/xkb/Makefile.am index b85ee8a41..e54ce59f0 100644 --- a/xorg-server/xkb/Makefile.am +++ b/xorg-server/xkb/Makefile.am @@ -1,7 +1,6 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) \ - -DHAVE_XKB_CONFIG_H +AM_CFLAGS = $(DIX_CFLAGS) DDX_SRCS = \ ddxBeep.c \ diff --git a/xorg-server/xkb/Makefile.in b/xorg-server/xkb/Makefile.in index b8398fc53..117a61bb5 100644 --- a/xorg-server/xkb/Makefile.in +++ b/xorg-server/xkb/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/dolt.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)/m4/shave.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -131,7 +131,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ @@ -156,7 +155,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -180,6 +178,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@ DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@ DOLT_BASH = @DOLT_BASH@ +DOXYGEN = @DOXYGEN@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@ @@ -197,8 +196,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FC = @FC@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ @@ -244,7 +241,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ -MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MAKE_HTML = @MAKE_HTML@ MAKE_PDF = @MAKE_PDF@ @@ -270,6 +266,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ @@ -279,7 +276,6 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PROJECTROOT = @PROJECTROOT@ PS2PDF = @PS2PDF@ -Q = @Q@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ @@ -293,7 +289,6 @@ STRIP = @STRIP@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ -V = @V@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ WINDRES = @WINDRES@ @@ -335,8 +330,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@ XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@ XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@ -XSDL_INCS = @XSDL_INCS@ -XSDL_LIBS = @XSDL_LIBS@ XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@ XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@ XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@ @@ -379,6 +372,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -410,7 +404,6 @@ psdir = @psdir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ -shavedir = @shavedir@ srcdir = @srcdir@ symbol_visibility = @symbol_visibility@ sysconfdir = @sysconfdir@ @@ -419,9 +412,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) \ - -DHAVE_XKB_CONFIG_H - +AM_CFLAGS = $(DIX_CFLAGS) DDX_SRCS = \ ddxBeep.c \ ddxCtrls.c \ diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index ba8d50b19..72aff2ac0 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#ifdef HAVE_XKB_CONFIG_H #include -#endif #include #include diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index 7abbeaaff..98e879ddb 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -554,7 +554,7 @@ ProcXkbGetState(ClientPtr client) if (!(client->xkbClientFlags&_XkbClientInitialized)) return BadAccess; - CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess); + CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess); xkb= &dev->key->xkbInfo->state; bzero(&rep,sizeof(xkbGetStateReply)); diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c index 747c913f3..3d0fb0014 100644 --- a/xorg-server/xkb/xkbInit.c +++ b/xorg-server/xkb/xkbInit.c @@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#ifdef HAVE_XKB_CONFIG_H #include -#endif #include #include diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c index 75e243ca5..a214b75d7 100644 --- a/xorg-server/xkb/xkbUtils.c +++ b/xorg-server/xkb/xkbUtils.c @@ -343,13 +343,13 @@ CARD8 * repeat; repeat= xkb->ctrls->per_key_repeat; if (pXDev->kbdfeed) - memcpy(repeat,pXDev->kbdfeed->ctrl.autoRepeats,32); + memcpy(repeat,pXDev->kbdfeed->ctrl.autoRepeats,XkbPerKeyBitArraySize); XkbUpdateDescActions(xkb,first,num,changes); if ((pXDev->kbdfeed)&& (changes->ctrls.enabled_ctrls_changes&XkbPerKeyRepeatMask)) { - memcpy(pXDev->kbdfeed->ctrl.autoRepeats,repeat, 32); + memcpy(pXDev->kbdfeed->ctrl.autoRepeats,repeat, XkbPerKeyBitArraySize); (*pXDev->kbdfeed->CtrlProc)(pXDev, &pXDev->kbdfeed->ctrl); } return; -- cgit v1.2.3