GL/Makefile.in | 2
GL/glx/Makefile.in | 2
GL/mesa/Makefile.in | 2
GL/mesa/X/Makefile.in | 2
GL/mesa/array_cache/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
Makefile.in | 2
XTrap/Makefile.in | 2
Xext/Makefile.in | 2
Xi/Makefile.in | 2
aclocal.m4 | 2
afb/Makefile.in | 2
cfb/Makefile.in | 2
cfb32/Makefile.in | 2
composite/Makefile.in | 2
config.guess | 32 +
config.sub | 16
configure | 170
+++++-----
damageext/Makefile.in | 2
dbe/Makefile.in | 2
debian/changelog | 11
debian/patches/41_vbe_filter_less.diff | 8
debian/patches/48_disable_type1.diff | 67 +++
debian/patches/49_map_keyboard_driver_to_kbd.diff | 63 +++
debian/patches/series | 2
debian/rules | 3
dix/Makefile.in | 2
doc/Makefile.in | 2
exa/Makefile.in | 2
fb/Makefile.in | 2
hw/Makefile.in | 2
hw/darwin/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/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/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/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 | 19 -
hw/xfree86/dixmods/extmod/Makefile.in | 2
hw/xfree86/doc/Makefile.in | 2
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/modes/Makefile.in | 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/linux/Makefile.in | 2
hw/xfree86/os-support/lynxos/Makefile.in | 2
hw/xfree86/os-support/misc/Makefile.in | 2
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/parser/Makefile.in | 2
hw/xfree86/rac/Makefile.in | 2
hw/xfree86/ramdac/Makefile.in | 2
hw/xfree86/scanpci/Makefile.in | 2
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/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
mfb/Makefile.in | 2
mi/Makefile.in | 2
miext/Makefile.in | 2
miext/cw/Makefile.in | 2
miext/damage/Makefile.in | 2
miext/rootless/Makefile.in | 2
miext/shadow/Makefile.in | 2
os/Makefile.in | 2
randr/Makefile.in | 2
record/Makefile.in | 2
render/Makefile.in | 2
xfixes/Makefile.in | 2
xkb/Makefile.in | 2
177 files changed, 628 insertions(+), 97 deletions(-)
New commits:
commit bdf5787b4feab1a74819fa639a41ddf0d5e0a68c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 12 16:01:12 2007 +0200
Map the keyboard driver to kbd.
Preserve compatibility with old xorg.conf files that have "keyboard" or
"Keyboard" drivers listed.
Patch by Alan Coopersmith.
diff --git a/debian/changelog b/debian/changelog
index 90b2696..2032e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ xorg-server (2:1.3.0.0.dfsg-8) UNRELEASED; urgency=low
[ Julien Cristau ]
* Don't build the type1 font module.
+ * Add patch by Alan Coopersmith to map (case-insensitively) the old
+ "keyboard" input driver to "kbd" (addresses: #428794). I'm not
+ reassigning the bug to xserver-xorg-core for now so as not to break
+ testing by letting xserver-xorg-input-keyboard transition before the fixed
+ xorg-server.
- -- Julien Cristau <[EMAIL PROTECTED]> Wed, 11 Jul 2007 05:25:27 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 12 Jul 2007 15:06:37 +0200
xorg-server (2:1.3.0.0.dfsg-7) unstable; urgency=low
diff --git a/debian/patches/49_map_keyboard_driver_to_kbd.diff
b/debian/patches/49_map_keyboard_driver_to_kbd.diff
new file mode 100644
index 0000000..4491a79
--- /dev/null
+++ b/debian/patches/49_map_keyboard_driver_to_kbd.diff
@@ -0,0 +1,63 @@
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# 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
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+Preserve compatibility with old xorg.conf files that have "keyboard" or
+"Keyboard" drivers listed. (Sun bug 6560332)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=11301
+Debian bug#428794
+
+--- hw/xfree86/common/xf86Init.c 2007-05-18 18:26:06.499884000 -0700
++++ hw/xfree86/common/xf86Init.c 2007-05-22 16:13:04.691806000 -0700
+@@ -1033,6 +1033,14 @@
+
+ continue;
+ }
++#else
++ /* Replace obsolete keyboard driver with kbd */
++ if (!xf86NameCmp(pDev->driver, "keyboard")) {
++ xf86MsgVerb(X_WARNING, 0, "*** WARNING the legacy keyboard
driver \"%s\" is deprecated\n", pDev->driver);
++ xf86MsgVerb(X_WARNING, 0, "*** Using the new \"kbd\" driver for
\"%s\".\n",
++ pDev->identifier);
++ strcpy(pDev->driver, "kbd");
++ }
+ #endif
+
+ if ((pDrv = MatchInput(pDev)) == NULL) {
+@@ -1953,6 +1961,11 @@
+ if (name == NULL || *name == '\0')
+ continue;
+
++ /* Replace obsolete keyboard driver with kbd */
++ if (!xf86NameCmp(name, "keyboard")) {
++ strcpy(name, "kbd");
++ }
++
+ if (optlist)
+ opt = optlist[i];
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 6d13e37..2d9c3e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
46_export-ramdac-symbols.diff
47_fbdevhw_magic_numbers.diff
48_disable_type1.diff
+49_map_keyboard_driver_to_kbd.diff -p0
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
commit a74dd0f8bdd1481ca7dffd14b096188e39f765fc
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 5 18:17:05 2007 +0200
Don't build the type1 font module.
Also don't load it automatically.
diff --git a/GL/Makefile.in b/GL/Makefile.in
index 4220c32..1b5856d 100644
--- a/GL/Makefile.in
+++ b/GL/Makefile.in
@@ -104,6 +104,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/glx/Makefile.in b/GL/glx/Makefile.in
index 29fda98..afe3fb8 100644
--- a/GL/glx/Makefile.in
+++ b/GL/glx/Makefile.in
@@ -127,6 +127,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/Makefile.in b/GL/mesa/Makefile.in
index 1af472c..c474c71 100644
--- a/GL/mesa/Makefile.in
+++ b/GL/mesa/Makefile.in
@@ -123,6 +123,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/X/Makefile.in b/GL/mesa/X/Makefile.in
index c4e1b94..624b382 100644
--- a/GL/mesa/X/Makefile.in
+++ b/GL/mesa/X/Makefile.in
@@ -115,6 +115,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/array_cache/Makefile.in b/GL/mesa/array_cache/Makefile.in
index d8a70d6..f77adc1 100644
--- a/GL/mesa/array_cache/Makefile.in
+++ b/GL/mesa/array_cache/Makefile.in
@@ -113,6 +113,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/glapi/Makefile.in b/GL/mesa/glapi/Makefile.in
index 99b4e3f..21e855c 100644
--- a/GL/mesa/glapi/Makefile.in
+++ b/GL/mesa/glapi/Makefile.in
@@ -113,6 +113,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/main/Makefile.in b/GL/mesa/main/Makefile.in
index a5f6245..387c1ee 100644
--- a/GL/mesa/main/Makefile.in
+++ b/GL/mesa/main/Makefile.in
@@ -126,6 +126,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/math/Makefile.in b/GL/mesa/math/Makefile.in
index f1710e8..6e576f9 100644
--- a/GL/mesa/math/Makefile.in
+++ b/GL/mesa/math/Makefile.in
@@ -115,6 +115,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/shader/Makefile.in b/GL/mesa/shader/Makefile.in
index 890a01b..e948c29 100644
--- a/GL/mesa/shader/Makefile.in
+++ b/GL/mesa/shader/Makefile.in
@@ -123,6 +123,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/shader/grammar/Makefile.in
b/GL/mesa/shader/grammar/Makefile.in
index a08b5ae..70349bf 100644
--- a/GL/mesa/shader/grammar/Makefile.in
+++ b/GL/mesa/shader/grammar/Makefile.in
@@ -113,6 +113,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/shader/slang/Makefile.in b/GL/mesa/shader/slang/Makefile.in
index 5e02ebb..df2eca3 100644
--- a/GL/mesa/shader/slang/Makefile.in
+++ b/GL/mesa/shader/slang/Makefile.in
@@ -122,6 +122,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/swrast/Makefile.in b/GL/mesa/swrast/Makefile.in
index 6ad855c..c80817b 100644
--- a/GL/mesa/swrast/Makefile.in
+++ b/GL/mesa/swrast/Makefile.in
@@ -119,6 +119,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/swrast_setup/Makefile.in b/GL/mesa/swrast_setup/Makefile.in
index f64761d..649a22f 100644
--- a/GL/mesa/swrast_setup/Makefile.in
+++ b/GL/mesa/swrast_setup/Makefile.in
@@ -113,6 +113,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/GL/mesa/tnl/Makefile.in b/GL/mesa/tnl/Makefile.in
index 52ea99e..9684f2d 100644
--- a/GL/mesa/tnl/Makefile.in
+++ b/GL/mesa/tnl/Makefile.in
@@ -120,6 +120,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/Makefile.in b/Makefile.in
index 664e540..5b380d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,6 +130,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/XTrap/Makefile.in b/XTrap/Makefile.in
index 99b4148..e035a0b 100644
--- a/XTrap/Makefile.in
+++ b/XTrap/Makefile.in
@@ -114,6 +114,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/Xext/Makefile.in b/Xext/Makefile.in
index 6395bae..2894c90 100644
--- a/Xext/Makefile.in
+++ b/Xext/Makefile.in
@@ -219,6 +219,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/Xi/Makefile.in b/Xi/Makefile.in
index c2913af..5325b04 100644
--- a/Xi/Makefile.in
+++ b/Xi/Makefile.in
@@ -120,6 +120,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/aclocal.m4 b/aclocal.m4
index 78910ae..4905d30 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6528,7 +6528,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/afb/Makefile.in b/afb/Makefile.in
index b72acf6..c992e48 100644
--- a/afb/Makefile.in
+++ b/afb/Makefile.in
@@ -133,6 +133,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/cfb/Makefile.in b/cfb/Makefile.in
index 5a58c09..d40fcb3 100644
--- a/cfb/Makefile.in
+++ b/cfb/Makefile.in
@@ -138,6 +138,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/cfb32/Makefile.in b/cfb32/Makefile.in
index ef66d81..e24fdae 100644
--- a/cfb32/Makefile.in
+++ b/cfb32/Makefile.in
@@ -127,6 +127,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/composite/Makefile.in b/composite/Makefile.in
index 6a1e55d..3856ff6 100644
--- a/composite/Makefile.in
+++ b/composite/Makefile.in
@@ -114,6 +114,8 @@ BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+BUILD_TYPE1_FALSE = @BUILD_TYPE1_FALSE@
+BUILD_TYPE1_TRUE = @BUILD_TYPE1_TRUE@
BUILD_XORGCFG_FALSE = @BUILD_XORGCFG_FALSE@
BUILD_XORGCFG_TRUE = @BUILD_XORGCFG_TRUE@
CC = @CC@
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# 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
@@ -161,6 +161,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index 2327151..bab4486 100755
--- a/configure
+++ b/configure
@@ -935,6 +935,8 @@ MAKE_PDF
MAKE_HTML
INSTALL_LIBXF86CONFIG_TRUE
INSTALL_LIBXF86CONFIG_FALSE
+BUILD_TYPE1_TRUE
+BUILD_TYPE1_FALSE
XV_TRUE
XV_FALSE
XVMC_TRUE
@@ -1896,6 +1898,7 @@ Optional Features:
--enable-builddocs Build docs (default: disabled)
--enable-install-libxf86config
Install libxf86config (default: disabled)
+ --disable-type1 Build the type1 font module (default: enabled)
--disable-composite Build Composite extension (default: enabled)
--disable-shm Build SHM extension (default: enabled)
--disable-xres Build XRes extension (default: enabled)
@@ -5049,7 +5052,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5052 "configure"' > conftest.$ac_ext
+ echo '#line 5055 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8071,11 +8074,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:8074: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8078: \$? = $ac_status" >&5
+ echo "$as_me:8081: \$? = $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.
@@ -8339,11 +8342,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:8342: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8345: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8346: \$? = $ac_status" >&5
+ echo "$as_me:8349: \$? = $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.
@@ -8443,11 +8446,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:8446: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8449: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8450: \$? = $ac_status" >&5
+ echo "$as_me:8453: \$? = $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
@@ -10740,7 +10743,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10743 "configure"
+#line 10746 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10840,7 +10843,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10843 "configure"
+#line 10846 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13176,11 +13179,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:13179: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13182: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13183: \$? = $ac_status" >&5
+ echo "$as_me:13186: \$? = $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.
@@ -13280,11 +13283,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:13283: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13286: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13287: \$? = $ac_status" >&5
+ echo "$as_me:13290: \$? = $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
@@ -14841,11 +14844,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:14844: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14847: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14848: \$? = $ac_status" >&5
+ echo "$as_me:14851: \$? = $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.
@@ -14945,11 +14948,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:14948: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14951: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14952: \$? = $ac_status" >&5
+ echo "$as_me:14955: \$? = $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
@@ -17132,11 +17135,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:17135: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17138: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17139: \$? = $ac_status" >&5
+ echo "$as_me:17142: \$? = $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.
@@ -17400,11 +17403,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:17403: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17406: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17407: \$? = $ac_status" >&5
+ echo "$as_me:17410: \$? = $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.
@@ -17504,11 +17507,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:17507: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17510: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17511: \$? = $ac_status" >&5
+ echo "$as_me:17514: \$? = $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
@@ -25229,6 +25232,13 @@ else
INSTALL_LIBXF86CONFIG=no
fi
+# Check whether --enable-type1 was given.
+if test "${enable_type1+set}" = set; then
+ enableval=$enable_type1; TYPE1=$enableval
+else
+ TYPE1=yes
+fi
+
# Check whether --enable-composite was given.
if test "${enable_composite+set}" = set; then
@@ -26634,6 +26644,17 @@ else
fi
+
+
+if test "x$TYPE1" = xyes; then
+ BUILD_TYPE1_TRUE=
+ BUILD_TYPE1_FALSE='#'
+else
+ BUILD_TYPE1_TRUE='#'
+ BUILD_TYPE1_FALSE=
+fi
+
+
XEXT_INC='-I$(top_srcdir)/Xext'
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
@@ -26916,7 +26937,7 @@ 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.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+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
@@ -26926,7 +26947,7 @@ 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.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -27027,7 +27048,7 @@ 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 <http://www.freedesktop.org/software/pkgconfig>.
+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
@@ -27037,7 +27058,7 @@ 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 <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -27214,7 +27235,7 @@ Alternatively, you may set the environment variables
DRIPROTO_CFLAGS
and DRIPROTO_LIBS to avoid the need to call pkg-config.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
