xserver-xorg-video-s3virge: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 20
ChangeLog | 369 ++++++++++++-
Makefile.in | 31 -
aclocal.m4 | 265 ++++++---
config.guess | 60 +-
config.sub | 66 ++
configure | 985 +++++++++++++++++++++++++++++--------
configure.ac | 15
debian/changelog | 19
debian/control | 10
debian/patches/01_gen_pci_ids.diff | 14
debian/xsfbs/xsfbs.mk | 103 ---
debian/xsfbs/xsfbs.sh | 7
depcomp | 93 ++-
install-sh | 514 +++++++++++++------
ltmain.sh | 277 ++++++----
man/Makefile.am | 1
man/Makefile.in | 9
man/s3virge.man | 6
missing | 61 +-
mkinstalldirs | 5
src/Makefile.am | 1
src/Makefile.in | 32 -
src/newmmio.h | 1
src/regs3v.h | 1
src/s3v.h | 3
src/s3v_accel.c | 1
src/s3v_dac.c | 1
src/s3v_dga.c | 29 -
src/s3v_driver.c | 93 ++-
src/s3v_hwcurs.c | 1
src/s3v_i2c.c | 1
src/s3v_macros.h | 1
src/s3v_pcirename.h | 122 ++++
src/s3v_rop.h | 1
src/s3v_shadow.c | 1
src/s3v_xv.c | 144 -----
38 files changed, 2371 insertions(+), 1011 deletions(-)
New commits:
commit c9bb41b9f96763c6700d15aeedbf7215af9cfc4a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 20 01:51:41 2008 +0100
debian/control updates
* Remove Branden from Uploaders with his permission.
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 234a27b..534a34e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ xserver-xorg-video-s3virge (1:1.10.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release.
* Refresh 01_gen_pci_ids.diff.
+ * Remove Branden from Uploaders with his permission.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 02:13:43 +0200
diff --git a/debian/control b/debian/control
index 6aeeb57..2e2c7df 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xserver-xorg-video-s3virge
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
-Standards-Version: 3.7.2.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3virge
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3virge.git
+Uploaders: David Nusinow <dnusinow@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-video-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libpciaccess-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3virge
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3virge.git
Package: xserver-xorg-video-s3virge
Architecture: any
commit 055b424eb418d551cb364a5d81d2856bdf1108d8
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 20 01:48:41 2008 +0100
Update changelogs and refresh patch.
diff --git a/ChangeLog b/ChangeLog
index 8ef0a7c..664fadb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,69 +1,348 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 127d572255eb125e65f2b5b5743bfd17b15b003c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:04:49 2008 -0400
- * configure.ac:
- * src/s3v_driver.c:
- Bump to 1.9.1 for Xv changes.
+ s3virge 1.10.0
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 187d5ee412877a6af0099a8be1c85d055bc52736
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:03:13 2008 -0400
- * src/s3v_xv.c:
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Fix distcheck
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 02871fe68525edb40d0956dee7643caa773d2404
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:01:59 2008 -0400
- * configure.ac:
- * src/s3v.h:
- * src/s3v_dga.c:
- * src/s3v_driver.c:
- * src/s3v_i2c.c:
- * src/s3v_shadow.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.9.0.
+ Death to RCS tags.
-2006-02-08 Luc Verhaegen <libv@skynet.be>
+commit cda576024eb76835dfb08dd17ebe6c6c6b84769c
+Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
+Date: Mon Mar 10 15:01:10 2008 +1000
- * src/s3v.h:
- * src/s3v_driver.c: (S3VPreInit):
+ oops fixed pointed out by pcpa
- Remove another insane use of pScrn->clock. Code ended up being ignored
- anyway.
+commit 44aca1d9fe5c51e591aa5a33a3f46d3ad46dc0b9
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Mar 10 13:19:01 2008 +1000
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ s3virge: pciaccess conversion
- * configure.ac:
- Update package version for X11R7 release.
+commit 75edb6b05afa2e739c214d5c1321acd6b68409f2
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Mar 8 23:46:56 2008 +0100
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Makefile.am: nuke RCS Id
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit e3833f9ae20f5bc25918a1f95216246711bbdf4e
+Author: Андрей Рандрианасулу <randrianasulu@mail.ru>
+Date: Thu Oct 25 21:35:53 2007 -0400
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Clean up: Remove some mga remains
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit ee9f04bd24892db06ad84c6372e3a03092fdb702
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 12:52:51 2007 +0200
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Define S3VIRGE_VERSION_* using PACKAGE_VERSION*
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit ca0f65b30bc050fbfe5ef77a02fcd4c75def3f01
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:53:36 2007 -0800
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ renamed: .cvsignore -> .gitignore
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit 7d8655ae45b81a26a0901187f03b0dc19dd51b13
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:53:14 2007 -0800
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+ Replace references to XFree86/XF86Config in man page
- * configure.ac:
- Only build dlloader modules by default.
+commit de67c1d5005caf474d104265717edd41a65ab830
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:40:56 2006 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.9.1 for Xv changes.
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit e460adf2caa0c0a7925f89ea62d17d4f0d3a8757
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:12:35 2006 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 2796accd84d93651cb654329815dc8880e34ea68
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 20:50:21 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.9.0
+
+commit 018a01800804c218123f686c30e4a86a9aca4d9f
+Author: Luc Verhaegen <libv@skynet.be>
+Date: Wed Feb 8 16:17:05 2006 +0000
+
+ S3V: Remove another insane use of pScrn->clock. Code ended up being ignored
+ anyway.
+
+commit afad0ef3b02f19b10bc9cb65be7aba52ded700f7
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:02 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 8fa0dd5c8b325bdf15d5cd19b4b1ee3f60705e74
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
+
+ Stub COPYING files
+
+commit f0e535c17f3e69cf1e2a189ef4f6ae78d772f3c9
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:18 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit f739da84b0f39a30c171577c0f52e992c251a750
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:37 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 1a3f4df69efbe3f1a0d85f123f55d31f402ac0d6
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:34 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 2b8250699422bac9c6faeb4d73cb6440cd9f08e7
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:09 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 74dc48a434d092a19bcc66aff6a723a4286e8b05
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:02 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit b16ae2403e98a9c54994c6c44d35b57dbb54b72a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:10 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 3ff07398b233e87b2bbc74ebf66519fed4291419
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:17 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit ec6ff9e1b6bfbdee3127d2c6d0f5a5378098e5d3
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 324358600856415c6133a1c71f46d0f43a98dd07
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit ed7767ca7ef09ce8c8b9352b606310055465ff67
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 9432a148ace59e6bf3228fddcbbf56f828cd71bb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:54 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 70f8ca96c8e9caf27a3d41b9a801816652fd53e8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:35 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 8ceb60e19a8793e91c917bf66f91547607cab4c7
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:05 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 7a84a2af7d6d6cf5b05360756b8dcbfb871a8dc6
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Oct 4 20:01:03 2005 +0000
+
+ Check in generated README files
+
+commit 31b03fe09b150de15f7b6c14d275be3ca33b4c85
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Oct 3 21:22:08 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit 033dea549d36e031c11e2d311c9a91e29ae63068
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 22:01:31 2005 +0000
+
+ Add some more documentation files for s3virge driver
+
+commit da221f862e6604c19c6dc56b4bf0e9a50cddea47
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:48 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 0bf7a921ffe886f5db73ae698b25ec546ae3a0ed
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit e1f25d5478cb252b3186b13a57130a676d0e6c05
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 18:47:44 2005 +0000
+
+ Build system for s3virge
+
+commit dfe9966ee9db8e2eda43e11fe9ccf981bdcd1461
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:59 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 07f088b855df57a0257d748ab490a01640dc8a71
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:56 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit ccb5c4209d36e66d557727f9534ccc1a3cf07f6d
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:29 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit bf5fc4151b70e17df31b780e25f1abc8e4b960b4
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:43:09 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit b578b52fce3113e36d91db23d0587145e2e1775a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Sep 17 03:04:53 2004 +0000
+
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+
+commit a1b008b69196fc7a3c67a6468da6d216d9e4d5c0
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Aug 16 09:13:14 2004 +0000
+
+ Bug #1087: Make sure all the *Weak symbols are documented in the import
+ list, so the loader knows not to complain about unresolved symbols when
+ an optional module isn't loaded. This typically manifests as warnings
+ about fbdevHW symbols when the user isn't using the framebuffer
+ console.
+
+commit 018977454204ceb8bcd9b89d699ea4913d526e79
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jul 31 01:21:19 2004 +0000
+
+ Change several LoaderSymbol calls introduced by the bug #400 patch to
+ *Weak() resolver functions.
+
+commit 8c40e6973838cc9658c63101a6b4c4e201bf5ec4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:54 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit ceed4d50d8cb262b571137ac6da6c0152fc4b03e
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:33 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 223ace8b63fb5d663768d260691791e264b4fc37
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:43:44 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 2ef4d3c439060c16a75ffd31a3c8b97fcf75b5fc
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:31 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d9fbf74d6505b5e3a0c1e34b818515d90fc0a1f3
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:23 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 4955d18dc7526c1a67209b46dd42f0a9c8889d59
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:54 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 51fce9291c5e9a8c8ca4702cfdb4c943af1c056a
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:23 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit c219348b0c7a4b5ea2580179e9f2d5e080e657fd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:38 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 61026597c90bc76c6a96bd3b8fb416e60e083b9d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 284d0bde93e41f74cb5992a877ccfff1538278e0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 2c386b3..234a27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-xserver-xorg-video-s3virge (1:1.9.1-8) UNRELEASED; urgency=low
+xserver-xorg-video-s3virge (1:1.10.0-1) UNRELEASED; urgency=low
- * Add upstream URL to debian/copyright.
+ [ Brice Goglin ]
+ * Add upstream URL to debian/copyright.
+
+ [ Julien Cristau ]
+ * New upstream release.
+ * Refresh 01_gen_pci_ids.diff.
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 02:13:43 +0200
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 12de254..6df118b 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,7 +1,5 @@
-Index: xserver-xorg-video-s3virge/src/s3virge.ids
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-s3virge/src/s3virge.ids 2007-08-31 18:18:35.000000000 -0400
+--- /dev/null
++++ xserver-xorg-video-s3virge/src/s3virge.ids
@@ -0,0 +1,8 @@
+53335631
+5333883D
@@ -11,11 +9,9 @@ Index: xserver-xorg-video-s3virge/src/s3virge.ids
+53338C03
+53338904
+53338A13
-Index: xserver-xorg-video-s3virge/src/Makefile.am
-===================================================================
---- xserver-xorg-video-s3virge.orig/src/Makefile.am 2007-08-31 18:18:50.000000000 -0400
-+++ xserver-xorg-video-s3virge/src/Makefile.am 2007-08-31 18:19:24.000000000 -0400
-@@ -42,3 +42,6 @@
+--- xserver-xorg-video-s3virge.orig/src/Makefile.am
++++ xserver-xorg-video-s3virge/src/Makefile.am
+@@ -43,3 +43,6 @@
s3v_rop.h \
s3v_shadow.c \
s3v_xv.c
commit 658ed5b550d29771d8c10ecfdf78a8655f2efb52
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 20 01:47:20 2008 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 4f650c8..39c11a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -116,6 +116,7 @@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -150,6 +151,7 @@ MAKE_TEXT = @MAKE_TEXT@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -158,6 +160,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
@@ -362,8 +366,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -388,8 +392,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -399,13 +403,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -475,6 +478,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -502,6 +509,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -653,8 +662,8 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
diff --git a/aclocal.m4 b/aclocal.m4
index cdb0a74..ef947f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@ file_magic*)
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -614,7 +689,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -707,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2],
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -978,7 +1057,7 @@ else
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1303,7 +1382,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1836,6 +1915,13 @@ esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2335,7 +2421,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2771,7 +2857,7 @@ aix3*)
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -2828,6 +2914,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -2937,7 +3024,7 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -2950,7 +3037,7 @@ case $host_os in
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3096,51 +3183,23 @@ case $host_os in
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -3391,7 +3450,7 @@ case $host_os in
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3826,7 +3885,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -3951,6 +4011,11 @@ fi
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -4007,7 +4072,6 @@ solaris*)
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4092,7 +4156,7 @@ aix3*)
Reply to: