libdrm: Changes to 'debian-unstable'
aclocal.m4 | 61 +-
config.guess | 667 ++++++++++++++-----------
config.sub | 230 ++++++--
configure | 791 +++++++++++++++++++++---------
configure.ac | 4
debian/changelog | 46 +
debian/compat | 2
debian/control | 25
debian/dirs | 2
debian/docs | 1
debian/libdrm-dev.install | 1
debian/libdrm2.shlibs | 1
debian/rules | 6
debian/watch | 2
libdrm/ChangeLog | 4
libdrm/Makefile.am | 4
libdrm/Makefile.in | 8
libdrm/config.h.in | 6
libdrm/xf86drm.c | 1196 +++++++++++++++++++++++++++++++++++++++++++---
libdrm/xf86drm.h | 34 +
libdrm/xf86mm.h | 209 ++++++++
ltmain.sh | 12
shared-core/Makefile.in | 4
shared-core/drm.h | 243 +++++++++
shared-core/i915_drm.h | 50 +
shared-core/mach64_drm.h | 4
shared-core/radeon_drm.h | 7
shared-core/via_drm.h | 48 -
28 files changed, 2918 insertions(+), 750 deletions(-)
New commits:
commit 72d63aec8bd29cc334025ebcb4136c2db2efae12
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 12 19:10:32 2007 +0200
Prepare upload to unstable.
* update my email address in debian/control
* add XS-Vcs-*
* delete useless debian/{dirs,docs} files
diff --git a/debian/changelog b/debian/changelog
index e1fcbca..4ac3363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.3.0-2) unstable; urgency=low
+
+ * Update my email address in debian/control.
+ * Add XS-Vcs-Git and XS-Vcs-Browser in debian/control.
+ * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 19:06:57 +0200
+
libdrm (2.3.0-1) experimental; urgency=low
[ Thierry Reding ]
diff --git a/debian/control b/debian/control
index d00fe8e..b3b1264 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
Source: libdrm
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <julien.cristau@ens-lyon.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
Section: libs
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
Package: libdrm-dev
Section: libdevel
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
commit 109ecb8964f9de83d7b50dc9804b6f30223dcb5b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 31 08:54:28 2007 +0100
Update watch file.
diff --git a/debian/watch b/debian/watch
index 3da64b4..60b4b63 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://people.freedesktop.org/~ajax/libdrm/libdrm-(.*)\.tar\.gz
+http://dri.freedesktop.org/libdrm/libdrm-(.*)\.tar\.gz
commit 2cf18d6a87ba4c488f294ef83b5b1939ec031c4a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 19:48:13 2007 +0100
Move libdrm2-dbg to the libdevel section.
diff --git a/debian/control b/debian/control
index 2068cf2..bc273d1 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: Userspace interface to kernel DRM services -- runtime
This package provides the runtime environment for libdrm.
Package: libdrm2-dbg
-Section: libs
+Section: libdevel
Priority: extra
Architecture: any
Depends: libdrm2 (= ${binary:Version})
commit 11ac757a12e56c4ec3480447bea712b59e944b0e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 19:08:53 2007 +0100
* Don't install libdrm.la, and use dh_install --list-missing.
diff --git a/debian/changelog b/debian/changelog
index 7cfe7e1..e1fcbca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ libdrm (2.3.0-1) experimental; urgency=low
* Add build-dep on dpkg-dev >= 1.13.19 to make sure that the binary:Version
substvar is available.
* libdrm2-dbg depends on libdrm2 (= ${binary:Version}).
+ * Don't install libdrm.la, and use dh_install --list-missing.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:42:56 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:56:08 +0100
libdrm (2.2.0-0.1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 74ef34e..18ce9ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ binary-arch: build install
dh_installchangelogs
dh_installdocs
dh_installexamples
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp -Xlibdrm.la --list-missing
dh_link
dh_strip -plibdrm2 --dbg-package=libdrm2-dbg
dh_strip
commit ff9f67c8519509175a08857f7adc8a2bd81a016a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 18:54:54 2007 +0100
Delete unused file.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
commit 1a3cb6227d49236fe06c64583ada9bb96282f507
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 18:44:03 2007 +0100
* Add build-dep on dpkg-dev >= 1.13.19 to make sure that the binary:Version
substvar is available.
* libdrm2-dbg depends on libdrm2 (= ${binary:Version}).
diff --git a/debian/changelog b/debian/changelog
index 715f1bd..7cfe7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ libdrm (2.3.0-1) experimental; urgency=low
[ Julien Cristau ]
* Bump shlibs to libdrm2 >= 2.3.0.
* Add myself to uploaders.
+ * Add build-dep on dpkg-dev >= 1.13.19 to make sure that the binary:Version
+ substvar is available.
+ * libdrm2-dbg depends on libdrm2 (= ${binary:Version}).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:31:23 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:42:56 +0100
libdrm (2.2.0-0.1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 258b3e9..2068cf2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libdrm
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <julien.cristau@ens-lyon.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
Section: libs
@@ -36,6 +36,7 @@ Package: libdrm2-dbg
Section: libs
Priority: extra
Architecture: any
+Depends: libdrm2 (= ${binary:Version})
Description: Userspace interface to kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
commit cbb3eeafc6666ee09240a34636d361d29ed0a5b7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 18:33:47 2007 +0100
* Add myself to uploaders.
diff --git a/debian/changelog b/debian/changelog
index 73c5f39..715f1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ libdrm (2.3.0-1) experimental; urgency=low
[ Julien Cristau ]
* Bump shlibs to libdrm2 >= 2.3.0.
+ * Add myself to uploaders.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:17:58 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:31:23 +0100
libdrm (2.2.0-0.1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 215a373..258b3e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: libdrm
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <julien.cristau@ens-lyon.org>
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev
Standards-Version: 3.7.2
Section: libs
commit 6212a637320d77f793db782885e0ae9c8a0ac900
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jan 4 18:20:02 2007 +0100
* Bump shlibs to libdrm2 >= 2.3.0.
diff --git a/debian/changelog b/debian/changelog
index 6b85f10..73c5f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
libdrm (2.3.0-1) experimental; urgency=low
+ [ Thierry Reding ]
* New upstream release.
* Set the Debian X Strike Force as maintainer.
* Add myself to uploaders.
* Add a debugging symbol package for libdrm2.
- -- Thierry Reding <thierry@gilfi.de> Thu, 4 Jan 2007 17:26:10 +0100
+ [ Julien Cristau ]
+ * Bump shlibs to libdrm2 >= 2.3.0.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 18:17:58 +0100
libdrm (2.2.0-0.1) experimental; urgency=low
diff --git a/debian/libdrm2.shlibs b/debian/libdrm2.shlibs
new file mode 100644
index 0000000..e987c72
--- /dev/null
+++ b/debian/libdrm2.shlibs
@@ -0,0 +1 @@
+libdrm 2 libdrm2 (>= 2.3.0)
commit f3b57497c5fac2a227ecfcdfa9636cea99c80f4c
Author: Thierry Reding <thierry@gilfi.de>
Date: Thu Jan 4 17:28:44 2007 +0100
Hijack the package (set XSF as maintainer, add myself to uploaders).
diff --git a/debian/changelog b/debian/changelog
index a275910..6b85f10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libdrm (2.3.0-0.1) experimental; urgency=low
+libdrm (2.3.0-1) experimental; urgency=low
- * Non-maintainer upload.
* New upstream release.
+ * Set the Debian X Strike Force as maintainer.
+ * Add myself to uploaders.
* Add a debugging symbol package for libdrm2.
- -- Thierry Reding <thierry@gilfi.de> Sun, 26 Nov 2006 03:45:50 +0100
+ -- Thierry Reding <thierry@gilfi.de> Thu, 4 Jan 2007 17:26:10 +0100
libdrm (2.2.0-0.1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f359681..215a373 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: libdrm
Priority: optional
-Maintainer: Marcelo E. Magallon <mmagallo@debian.org>
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev
Standards-Version: 3.7.2
Section: libs
commit 501a3c94d9e46269568faa3c27dac3ecad9dc87c
Author: Thierry Reding <thierry@gilfi.de>
Date: Sun Nov 26 02:48:59 2006 +0000
Make the latest changelog entries look like non-maintainer uploads.
diff --git a/debian/changelog b/debian/changelog
index 46a2d7b..a275910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-libdrm (2.3.0-1) experimental; urgency=low
+libdrm (2.3.0-0.1) experimental; urgency=low
+ * Non-maintainer upload.
* New upstream release.
+ * Add a debugging symbol package for libdrm2.
- -- Thierry Reding <thierry@gilfi.de> Tue, 21 Nov 2006 15:19:07 +0100
+ -- Thierry Reding <thierry@gilfi.de> Sun, 26 Nov 2006 03:45:50 +0100
-libdrm (2.2.0-1) experimental; urgency=low
+libdrm (2.2.0-0.1) experimental; urgency=low
+ * Non-maintainer upload.
* New upstream release.
- * Set the Debian X Strike Force as the new maintainer.
- * Add myself to uploaders.
* Bump Standards-Version to 3.7.2, no changes required.
* Bump debhelper compatibility to 5 and adjust build-dependency.
* Don't try to install pkgconfig files from usr/share/pkgconfig because
diff --git a/debian/control b/debian/control
index 215a373..f359681 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
Source: libdrm
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>
+Maintainer: Marcelo E. Magallon <mmagallo@debian.org>
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev
Standards-Version: 3.7.2
Section: libs
commit 713dc07d4fea985a87750e47e9aee97671258713
Author: Thierry Reding <thierry@gilfi.de>
Date: Sun Nov 26 02:45:46 2006 +0000
Add a debugging package for the libdrm2 library.
diff --git a/debian/control b/debian/control
index feb045a..215a373 100644
--- a/debian/control
+++ b/debian/control
@@ -31,3 +31,17 @@ Description: Userspace interface to kernel DRM services -- runtime
OpenGL drivers.
.
This package provides the runtime environment for libdrm.
+
+Package: libdrm2-dbg
+Section: libs
+Priority: extra
+Architecture: any
+Description: Userspace interface to kernel DRM services -- debugging symbols
+ This library implements the userspace interface to the kernel DRM
+ services. DRM stands for "Direct Rendering Manager", which is the
+ kernelspace portion of the "Direct Rendering Infrastructure" (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
+ .
+ This package provides debugging symbols for the libdrm2 package.
+
diff --git a/debian/rules b/debian/rules
index 32e7894..74ef34e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,8 @@ binary-arch: build install
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
-# dh_installman
dh_link
+ dh_strip -plibdrm2 --dbg-package=libdrm2-dbg
dh_strip
dh_compress
dh_fixperms
commit c0fcdefb45d8b5d81d971632a6fc827b93ed9094
Author: Thierry Reding <thierry@gilfi.de>
Date: Tue Nov 21 14:20:33 2006 +0000
Target the 2.2.0 and 2.3.0 releases at experimental.
diff --git a/debian/changelog b/debian/changelog
index 4fd94f5..46a2d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.3.0-1) unstable; urgency=low
+libdrm (2.3.0-1) experimental; urgency=low
* New upstream release.
- -- Thierry Reding <thierry@gilfi.de> Sat, 18 Nov 2006 20:01:28 +0100
+ -- Thierry Reding <thierry@gilfi.de> Tue, 21 Nov 2006 15:19:07 +0100
-libdrm (2.2.0-1) unstable; urgency=low
+libdrm (2.2.0-1) experimental; urgency=low
* New upstream release.
* Set the Debian X Strike Force as the new maintainer.
commit c5061dad5cdf2b340b8102c938da1eb997165b3b
Author: Thierry Reding <thierry@gilfi.de>
Date: Sat Nov 18 19:09:55 2006 +0000
Update to latest upstream version (2.3.0).
diff --git a/Makefile.in b/Makefile.in
index 7a6888f..0b54290 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,6 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -158,9 +157,12 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -177,31 +179,24 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
exec_prefix = @exec_prefix@
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@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
-psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff --git a/aclocal.m4 b/aclocal.m4
index 51774ec..5baa59e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,6 +1397,18 @@ freebsd1*)
dynamic_linker=no
;;
+kfreebsd*-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='GNU ld.so'
+ ;;
+
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -1552,7 +1564,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1593,6 +1605,18 @@ netbsdelf*-gnu)
dynamic_linker='NetBSD ld.elf_so'
;;
+knetbsd*-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='GNU ld.so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -2298,7 +2322,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | dragonfly*)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2352,11 +2376,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd* | netbsdelf*-gnu | knetbsd*-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
@@ -3104,7 +3128,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3263,7 +3287,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3365,7 +3389,7 @@ case $host_os in
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -4630,7 +4654,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux* | k*bsd*-gnu)
+linux*)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4903,7 +4927,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -4946,7 +4970,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4989,7 +5013,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5200,7 +5224,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5341,7 +5365,10 @@ ifelse([$1],[CXX],[
cygwin* | mingw*)
_LT_AC_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)
+ kfreebsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ linux*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
@@ -5514,7 +5541,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='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'
;;
- linux* | k*bsd*-gnu)
+ linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -5546,7 +5573,7 @@ EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5882,6 +5909,15 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
+
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+ kfreebsd*-gnu)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
hpux9*)
if test "$GCC" = yes; then
@@ -5978,7 +6014,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff --git a/configure b/configure
index 6934708..c04c40b 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,10 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for libdrm 2.2.0.
+# Generated by GNU Autoconf 2.59 for libdrm 2.3.0.
#
# Report bugs to <dri-devel@lists.sourceforge.net>.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -19,35 +18,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
# Zsh 3.x and 4.x performs 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
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-
-# 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
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
@@ -56,43 +31,8 @@ else
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-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
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (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
-done
+$as_unset ENV MAIL MAILPATH
PS1='$ '
PS2='> '
PS4='+ '
@@ -106,19 +46,18 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -126,386 +65,157 @@ fi
# Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# PATH needs CR, and LINENO needs CR and PATH.
+# 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
-
- 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
-}
-
-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.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
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
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ 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
-(
- 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=
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+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
+ case $as_dir in
Reply to: