xorg-server: Changes to 'debian-experimental'
GL/Makefile.in | 2
GL/apple/Makefile.in | 2
GL/glx/Makefile.in | 2
GL/mesa/Makefile.in | 2
GL/mesa/X/Makefile.in | 2
GL/mesa/glapi/Makefile.in | 2
GL/mesa/main/Makefile.in | 2
GL/mesa/math/Makefile.in | 2
GL/mesa/shader/Makefile.in | 2
GL/mesa/shader/grammar/Makefile.in | 2
GL/mesa/shader/slang/Makefile.in | 2
GL/mesa/swrast/Makefile.in | 2
GL/mesa/swrast_setup/Makefile.in | 2
GL/mesa/tnl/Makefile.in | 2
GL/mesa/vbo/Makefile.in | 2
Makefile.in | 2
XTrap/Makefile.in | 2
Xext/Makefile.in | 2
Xext/sync.c | 5
Xi/Makefile.in | 2
afb/Makefile.in | 2
cfb/Makefile.in | 2
cfb32/Makefile.in | 2
composite/Makefile.in | 2
config.guess | 6
config.sub | 10
config/Makefile.in | 2
config/hal.c | 35
config/x11-input.fdi | 10
configure | 218
configure.ac | 29
damageext/Makefile.in | 2
dbe/Makefile.in | 2
debian/changelog | 7
debian/control | 2
debian/copyright | 5
debian/rules | 2
debian/serverminver | 2
dix/Makefile.in | 2
doc/Makefile.in | 2
exa/Makefile.in | 2
exa/exa.c | 4
exa/exa_priv.h | 6
exa/exa_render.c | 126
fb/Makefile.in | 2
fb/fb.h | 3
fb/fbpict.c | 23
fb/fbtrap.c | 8
fb/wfbrename.h | 1
hw/Makefile.in | 2
hw/darwin/Makefile.in | 2
hw/darwin/bundle/Dutch.lproj/Makefile.in | 2
hw/darwin/bundle/English.lproj/Makefile.in | 2
hw/darwin/bundle/French.lproj/Makefile.in | 2
hw/darwin/bundle/German.lproj/Makefile.in | 2
hw/darwin/bundle/Japanese.lproj/Makefile.in | 2
hw/darwin/bundle/Makefile.in | 2
hw/darwin/bundle/Portuguese.lproj/Makefile.in | 2
hw/darwin/bundle/Spanish.lproj/Makefile.in | 2
hw/darwin/bundle/Swedish.lproj/Makefile.in | 2
hw/darwin/bundle/ko.lproj/Makefile.in | 2
hw/darwin/iokit/Makefile.in | 2
hw/darwin/quartz/Makefile.in | 2
hw/darwin/utils/Makefile.in | 2
hw/dmx/Makefile.in | 2
hw/dmx/config/Makefile.in | 2
hw/dmx/doc/Makefile.in | 2
hw/dmx/examples/Makefile.in | 2
hw/dmx/glxProxy/Makefile.in | 2
hw/dmx/input/Makefile.in | 2
hw/kdrive/Makefile.in | 2
hw/kdrive/ati/Makefile.in | 2
hw/kdrive/chips/Makefile.in | 2
hw/kdrive/ephyr/Makefile.in | 2
hw/kdrive/ephyr/ephyrinit.c | 35
hw/kdrive/epson/Makefile.in | 2
hw/kdrive/fake/Makefile.in | 2
hw/kdrive/fbdev/Makefile.in | 2
hw/kdrive/i810/Makefile.in | 2
hw/kdrive/linux/Makefile.in | 2
hw/kdrive/linux/evdev.c | 309
hw/kdrive/linux/linux.c | 2
hw/kdrive/linux/tslib.c | 2
hw/kdrive/mach64/Makefile.in | 2
hw/kdrive/mga/Makefile.in | 2
hw/kdrive/neomagic/Makefile.in | 2
hw/kdrive/nvidia/Makefile.in | 2
hw/kdrive/pm2/Makefile.in | 2
hw/kdrive/r128/Makefile.in | 2
hw/kdrive/sdl/Makefile.in | 2
hw/kdrive/sis300/Makefile.in | 2
hw/kdrive/smi/Makefile.in | 2
hw/kdrive/src/Makefile.in | 2
hw/kdrive/src/kdrive.c | 7
hw/kdrive/src/kdrive.h | 8
hw/kdrive/src/kinput.c | 161
hw/kdrive/vesa/Makefile.in | 2
hw/kdrive/via/Makefile.in | 2
hw/vfb/Makefile.in | 2
hw/xfree86/Makefile.in | 2
hw/xfree86/common/Makefile.in | 2
hw/xfree86/ddc/Makefile.in | 2
hw/xfree86/dixmods/Makefile.in | 2
hw/xfree86/dixmods/extmod/Makefile.in | 2
hw/xfree86/doc/Makefile.in | 2
hw/xfree86/doc/README.DRI | 1256 --
hw/xfree86/doc/devel/Makefile.in | 2
hw/xfree86/doc/man/Makefile.in | 2
hw/xfree86/doc/sgml/Makefile.in | 2
hw/xfree86/dri/Makefile.in | 2
hw/xfree86/dummylib/Makefile.in | 2
hw/xfree86/exa/Makefile.in | 2
hw/xfree86/fbdevhw/Makefile.in | 2
hw/xfree86/i2c/Makefile.in | 2
hw/xfree86/int10/Makefile.in | 2
hw/xfree86/loader/Makefile.in | 2
hw/xfree86/loader/xf86sym.c | 1
hw/xfree86/modes/Makefile.in | 2
hw/xfree86/modes/xf86EdidModes.c | 53
hw/xfree86/modes/xf86RandR12.c | 2
hw/xfree86/os-support/Makefile.in | 2
hw/xfree86/os-support/bsd/Makefile.in | 2
hw/xfree86/os-support/bus/Makefile.in | 2
hw/xfree86/os-support/hurd/Makefile.in | 2
hw/xfree86/os-support/hurd/hurd_mouse.c | 24
hw/xfree86/os-support/linux/Makefile.in | 2
hw/xfree86/os-support/lynxos/Makefile.in | 2
hw/xfree86/os-support/misc/Makefile.in | 2
hw/xfree86/os-support/misc/SlowBcopy.c | 30
hw/xfree86/os-support/sco/Makefile.in | 2
hw/xfree86/os-support/solaris/Makefile.in | 2
hw/xfree86/os-support/sysv/Makefile.in | 2
hw/xfree86/os-support/usl/Makefile.in | 2
hw/xfree86/os-support/xf86_OSproc.h | 1
hw/xfree86/parser/Makefile.in | 2
hw/xfree86/rac/Makefile.in | 2
hw/xfree86/ramdac/Makefile.in | 2
hw/xfree86/scanpci/Makefile.in | 2
hw/xfree86/scanpci/extrapci.ids | 17
hw/xfree86/scanpci/pci.ids | 652 +
hw/xfree86/scanpci/xf86PciStdIds.h | 5315 +++++++++-
hw/xfree86/shadowfb/Makefile.in | 2
hw/xfree86/utils/Makefile.in | 2
hw/xfree86/utils/cvt/Makefile.in | 2
hw/xfree86/utils/gtf/Makefile.in | 2
hw/xfree86/utils/ioport/Makefile.in | 2
hw/xfree86/utils/kbd_mode/Makefile.in | 2
hw/xfree86/utils/pcitweak/Makefile.in | 2
hw/xfree86/utils/scanpci/Makefile.in | 2
hw/xfree86/utils/xorgcfg/Makefile.in | 2
hw/xfree86/utils/xorgconfig/Makefile.in | 2
hw/xfree86/utils/xorgconfig/xorgconfig.c | 2
hw/xfree86/vbe/Makefile.in | 2
hw/xfree86/vgahw/Makefile.in | 2
hw/xfree86/x86emu/Makefile.in | 2
hw/xfree86/xaa/Makefile.in | 2
hw/xfree86/xf1bpp/Makefile.in | 2
hw/xfree86/xf4bpp/Makefile.in | 2
hw/xfree86/xf8_16bpp/Makefile.in | 2
hw/xfree86/xf8_32bpp/Makefile.in | 2
hw/xgl/Makefile.in | 2
hw/xgl/egl/Makefile.in | 2
hw/xgl/egl/module/Makefile.in | 2
hw/xgl/glx/Makefile.in | 2
hw/xgl/glx/module/Makefile.in | 2
hw/xgl/glxext/Makefile.in | 2
hw/xgl/glxext/module/Makefile.in | 2
hw/xnest/Makefile.in | 2
hw/xprint/Makefile.in | 2
hw/xprint/config/C/Makefile.in | 2
hw/xprint/config/C/print/Makefile.in | 2
hw/xprint/config/C/print/attributes/Makefile.in | 2
hw/xprint/config/C/print/ddx-config/Makefile.in | 2
hw/xprint/config/C/print/ddx-config/raster/Makefile.in | 2
hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in | 2
hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in | 2
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in | 2
hw/xprint/config/C/print/models/GSdefault/Makefile.in | 2
hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in | 2
hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in | 2
hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in | 2
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in | 2
hw/xprint/config/C/print/models/HPLJ4family/Makefile.in | 2
hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in | 2
hw/xprint/config/C/print/models/Makefile.in | 2
hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in | 2
hw/xprint/config/C/print/models/PSdefault/Makefile.in | 2
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in | 2
hw/xprint/config/C/print/models/PSspooldir/Makefile.in | 2
hw/xprint/config/C/print/models/SPSPARC2/Makefile.in | 2
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in | 2
hw/xprint/config/Makefile.in | 2
hw/xprint/config/en_US/Makefile.in | 2
hw/xprint/config/en_US/print/Makefile.in | 2
hw/xprint/config/en_US/print/attributes/Makefile.in | 2
hw/xprint/doc/Makefile.in | 2
hw/xprint/etc/Makefile.in | 2
hw/xprint/etc/Xsession.d/Makefile.in | 2
hw/xprint/etc/init.d/Makefile.in | 2
hw/xprint/etc/profile.d/Makefile.in | 2
hw/xprint/pcl-mono/Makefile.in | 2
hw/xprint/pcl/Makefile.in | 2
hw/xprint/ps/Makefile.in | 2
hw/xprint/raster/Makefile.in | 2
hw/xwin/Makefile.in | 2
include/Makefile.in | 2
include/miscstruct.h | 2
mfb/Makefile.in | 2
mi/Makefile.in | 2
mi/miregion.c | 2
miext/Makefile.in | 2
miext/cw/Makefile.in | 2
miext/damage/Makefile.in | 2
miext/rootless/Makefile.in | 2
miext/rootless/accel/Makefile.in | 2
miext/rootless/safeAlpha/Makefile.in | 2
miext/shadow/Makefile.in | 2
os/Makefile.in | 2
randr/Makefile.in | 2
randr/rrinfo.c | 9
randr/rroutput.c | 1
record/Makefile.in | 2
render/Makefile.in | 2
render/picture.h | 2
xfixes/Makefile.in | 2
xkb/Makefile.in | 2
xorg-server.pc.in | 2
ylwrap | 223
228 files changed, 7232 insertions(+), 1756 deletions(-)
New commits:
commit c91f1d7b94e73a704a9ab4e881c1edbf4d4e3ce3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 18 18:26:11 2007 +0200
autoreconf
diff --git a/GL/Makefile.in b/GL/Makefile.in
index 3c38cda..5e533be 100644
--- a/GL/Makefile.in
+++ b/GL/Makefile.in
@@ -198,6 +198,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/apple/Makefile.in b/GL/apple/Makefile.in
index 5c31903..bd0676d 100644
--- a/GL/apple/Makefile.in
+++ b/GL/apple/Makefile.in
@@ -211,6 +211,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/glx/Makefile.in b/GL/glx/Makefile.in
index ffa226f..ca68802 100644
--- a/GL/glx/Makefile.in
+++ b/GL/glx/Makefile.in
@@ -216,6 +216,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/Makefile.in b/GL/mesa/Makefile.in
index 4f0c394..44cad23 100644
--- a/GL/mesa/Makefile.in
+++ b/GL/mesa/Makefile.in
@@ -214,6 +214,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/X/Makefile.in b/GL/mesa/X/Makefile.in
index f96a127..f911380 100644
--- a/GL/mesa/X/Makefile.in
+++ b/GL/mesa/X/Makefile.in
@@ -202,6 +202,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/glapi/Makefile.in b/GL/mesa/glapi/Makefile.in
index 5636204..f7e782e 100644
--- a/GL/mesa/glapi/Makefile.in
+++ b/GL/mesa/glapi/Makefile.in
@@ -201,6 +201,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/main/Makefile.in b/GL/mesa/main/Makefile.in
index 6d42e55..9856a5d 100644
--- a/GL/mesa/main/Makefile.in
+++ b/GL/mesa/main/Makefile.in
@@ -214,6 +214,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/math/Makefile.in b/GL/mesa/math/Makefile.in
index 33ff1af..7b0e779 100644
--- a/GL/mesa/math/Makefile.in
+++ b/GL/mesa/math/Makefile.in
@@ -203,6 +203,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/shader/Makefile.in b/GL/mesa/shader/Makefile.in
index 4150f6e..806db1d 100644
--- a/GL/mesa/shader/Makefile.in
+++ b/GL/mesa/shader/Makefile.in
@@ -215,6 +215,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/shader/grammar/Makefile.in b/GL/mesa/shader/grammar/Makefile.in
index 8c7603b..0c59aff 100644
--- a/GL/mesa/shader/grammar/Makefile.in
+++ b/GL/mesa/shader/grammar/Makefile.in
@@ -201,6 +201,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/shader/slang/Makefile.in b/GL/mesa/shader/slang/Makefile.in
index 2671dfa..4171b23 100644
--- a/GL/mesa/shader/slang/Makefile.in
+++ b/GL/mesa/shader/slang/Makefile.in
@@ -208,6 +208,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/swrast/Makefile.in b/GL/mesa/swrast/Makefile.in
index cc946ad..4bcae3a 100644
--- a/GL/mesa/swrast/Makefile.in
+++ b/GL/mesa/swrast/Makefile.in
@@ -207,6 +207,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/swrast_setup/Makefile.in b/GL/mesa/swrast_setup/Makefile.in
index 129aa49..53f2bb5 100644
--- a/GL/mesa/swrast_setup/Makefile.in
+++ b/GL/mesa/swrast_setup/Makefile.in
@@ -201,6 +201,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/tnl/Makefile.in b/GL/mesa/tnl/Makefile.in
index 5e8e1c2..f8d5310 100644
--- a/GL/mesa/tnl/Makefile.in
+++ b/GL/mesa/tnl/Makefile.in
@@ -205,6 +205,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/GL/mesa/vbo/Makefile.in b/GL/mesa/vbo/Makefile.in
index 67476f6..377a09f 100644
--- a/GL/mesa/vbo/Makefile.in
+++ b/GL/mesa/vbo/Makefile.in
@@ -205,6 +205,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/Makefile.in b/Makefile.in
index 079ebc3..f65dea3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -220,6 +220,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/XTrap/Makefile.in b/XTrap/Makefile.in
index 06a874b..dbf91ac 100644
--- a/XTrap/Makefile.in
+++ b/XTrap/Makefile.in
@@ -202,6 +202,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/Xext/Makefile.in b/Xext/Makefile.in
index 530b2f6..a7a1db5 100644
--- a/Xext/Makefile.in
+++ b/Xext/Makefile.in
@@ -307,6 +307,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/Xi/Makefile.in b/Xi/Makefile.in
index 7755ba2..2eadd2c 100644
--- a/Xi/Makefile.in
+++ b/Xi/Makefile.in
@@ -208,6 +208,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/afb/Makefile.in b/afb/Makefile.in
index 2865085..65ddae8 100644
--- a/afb/Makefile.in
+++ b/afb/Makefile.in
@@ -221,6 +221,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/cfb/Makefile.in b/cfb/Makefile.in
index 68739c7..d1538e2 100644
--- a/cfb/Makefile.in
+++ b/cfb/Makefile.in
@@ -226,6 +226,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/cfb32/Makefile.in b/cfb32/Makefile.in
index 81e2e25..084b947 100644
--- a/cfb32/Makefile.in
+++ b/cfb32/Makefile.in
@@ -215,6 +215,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/composite/Makefile.in b/composite/Makefile.in
index 4381d2f..74c760f 100644
--- a/composite/Makefile.in
+++ b/composite/Makefile.in
@@ -202,6 +202,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/config.guess b/config.guess
index 0f0fe71..278f9e9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# 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
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index 5defff6..1761d8b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff --git a/config/Makefile.in b/config/Makefile.in
index 2be1cc1..402d368 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -223,6 +223,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PLIST_VENDOR_WEB = @PLIST_VENDOR_WEB@
PLIST_VERSION_STRING = @PLIST_VERSION_STRING@
diff --git a/configure b/configure
index 844367e..d689530 100755
--- a/configure
+++ b/configure
@@ -942,6 +942,8 @@ MAKE_PDF
MAKE_HTML
INSTALL_LIBXF86CONFIG_TRUE
INSTALL_LIBXF86CONFIG_FALSE
+PIXMAN_CFLAGS
+PIXMAN_LIBS
DBUS_CFLAGS
DBUS_LIBS
HAVE_DBUS_TRUE
@@ -1298,6 +1300,8 @@ FFLAGS
PKG_CONFIG
YACC
YFLAGS
+PIXMAN_CFLAGS
+PIXMAN_LIBS
DBUS_CFLAGS
DBUS_LIBS
HAL_CFLAGS
@@ -2035,6 +2039,8 @@ Optional Packages:
--with-tags[=TAGS] include additional configurations [automatic]
--with-dtrace=PATH Enable dtrace probes (default: enabled if dtrace
found)
+ --with-xerrordb=PATH Path to XErrorDB file (default:
+ ${datadir}/X11/XErrorDB)
--with-int10=BACKEND int10 backend: vm86, x86emu or stub
--with-vendor-name=VENDOR
Vendor string reported by the server
@@ -2109,6 +2115,9 @@ Some influential environment variables:
YFLAGS The list of arguments that will be passed by default to $YACC.
This script will default YFLAGS to the empty string to avoid a
default value of `-d' given by some make applications.
+ PIXMAN_CFLAGS
+ C compiler flags for PIXMAN, overriding pkg-config
+ PIXMAN_LIBS linker flags for PIXMAN, overriding pkg-config
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config
HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
@@ -5273,7 +5282,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5276 "configure"' > conftest.$ac_ext
+ echo '#line 5285 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8305,11 +8314,11 @@ else
-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:8308: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8317: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8312: \$? = $ac_status" >&5
+ echo "$as_me:8321: \$? = $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.
@@ -8595,11 +8604,11 @@ else
-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:8598: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8607: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8602: \$? = $ac_status" >&5
+ echo "$as_me:8611: \$? = $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.
@@ -8699,11 +8708,11 @@ else
-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:8702: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8711: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8706: \$? = $ac_status" >&5
+ echo "$as_me:8715: \$? = $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
@@ -11061,7 +11070,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11064 "configure"
+#line 11073 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11161,7 +11170,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11164 "configure"
+#line 11173 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13581,11 +13590,11 @@ else
-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:13584: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13588: \$? = $ac_status" >&5
+ echo "$as_me:13597: \$? = $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.
@@ -13685,11 +13694,11 @@ else
-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:13688: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13692: \$? = $ac_status" >&5
+ echo "$as_me:13701: \$? = $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
@@ -15262,11 +15271,11 @@ else
-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:15265: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15274: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15269: \$? = $ac_status" >&5
+ echo "$as_me:15278: \$? = $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.
@@ -15366,11 +15375,11 @@ else
-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:15369: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15373: \$? = $ac_status" >&5
+ echo "$as_me:15382: \$? = $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
@@ -17566,11 +17575,11 @@ else
-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:17569: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17573: \$? = $ac_status" >&5
+ echo "$as_me:17582: \$? = $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.
@@ -17856,11 +17865,11 @@ else
-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:17859: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17868: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17863: \$? = $ac_status" >&5
+ echo "$as_me:17872: \$? = $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.
@@ -17960,11 +17969,11 @@ else
-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:17963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17967: \$? = $ac_status" >&5
+ echo "$as_me:17976: \$? = $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
@@ -21547,11 +21556,21 @@ else
fi
+# DTrace support uses XErrorDB to get request names
+
+# Check whether --with-xerrordb was given.
+if test "${with_xerrordb+set}" = set; then
+ withval=$with_xerrordb; XERRORDB_PATH="$withval"
+else
+ XERRORDB_PATH="${datadir}/X11/XErrorDB"
+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="\"$libdir/XErrorDB\""
+ eval ac_define_dir="\"$XERRORDB_PATH\""
eval ac_define_dir="\"$ac_define_dir\""
XERRORDB_PATH="$ac_define_dir"
@@ -28076,7 +28095,119 @@ XEXT_INC='-I$(top_srcdir)/Xext'
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-PIXMAN="pixman >= 0.9.2"
+PIXMAN="pixman-1 >= 0.9.4"
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for PIXMAN" >&5
+echo $ECHO_N "checking for PIXMAN... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PIXMAN_CFLAGS"; then
+ pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PIXMAN\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$PIXMAN") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "$PIXMAN" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PIXMAN_LIBS"; then
+ pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PIXMAN\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$PIXMAN") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PIXMAN_LIBS=`$PKG_CONFIG --libs "$PIXMAN" 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
+ PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$PIXMAN"`
+ else
+ PIXMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$PIXMAN"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PIXMAN_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements ($PIXMAN) were not met:
+
+$PIXMAN_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 PIXMAN_CFLAGS
+and PIXMAN_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements ($PIXMAN) were not met:
+
+$PIXMAN_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 PIXMAN_CFLAGS
+and PIXMAN_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PIXMAN_CFLAGS
+and PIXMAN_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+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 PIXMAN_CFLAGS
+and PIXMAN_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ PIXMAN_CFLAGS=$pkg_cv_PIXMAN_CFLAGS
+ PIXMAN_LIBS=$pkg_cv_PIXMAN_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
REQUIRED_MODULES="randrproto >= 1.2 renderproto fixesproto >= 4.0 damageproto >= 1.1 xcmiscproto xextproto xproto >= 7.0.9 xtrans scrnsaverproto >= 1.1 bigreqsproto resourceproto fontsproto inputproto >= 1.4.2 kbproto >= 1.0.3"
REQUIRED_LIBS="xfont xau fontenc $PIXMAN"
@@ -30705,7 +30836,7 @@ echo "$as_me: error: Xdmx build explicitly requested, but required
{ (exit 1); exit 1; }; }
fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
- XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB"
+ XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB"
if test "${ac_cv_header_linux_input_h+set}" = set; then
@@ -32115,7 +32246,7 @@ fi
if test "x$XGL" = xyes; then
- XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
cat >>confdefs.h <<\_ACEOF
@@ -32234,7 +32365,7 @@ fi
if test "x$XEGL" = xyes; then
- XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
fi
@@ -32328,7 +32459,7 @@ fi
if test "x$XGLX" = xyes; then
- XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
Reply to: