.cvsignore | 19 ChangeLog | 218 + Makefile.in | 12 aclocal.m4 | 379 +- autogen.sh | 12 config.guess | 685 ++-- config.h.in | 9 config.sub | 240 + configure | 7759 ++++++++++++++++++++++++++------------------------ debian/changelog | 23 debian/control | 14 debian/rules | 4 debian/xsfbs/xsfbs.mk | 21 ltmain.sh | 12 man/.cvsignore | 2 man/Makefile.am | 2 man/Makefile.in | 14 man/sunbw2.man | 4 src/.cvsignore | 6 src/Makefile.in | 12 20 files changed, 5258 insertions(+), 4189 deletions(-)
New commits: commit 61ceeb1de7a0d34ed9eae9f91600af7670bc7ca6 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Tue May 1 13:52:10 2007 +0200 autoreconf 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 ;; commit 5b730ce824baeccc7eb737c71bc51b7e63981cb9 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Tue May 1 13:51:17 2007 +0200 Pull upstream manpage fix 4b97b50a48eb0b3a978d7d4fb082e07f51363953 diff --git a/ChangeLog b/ChangeLog index 45aa805..73875a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,46 +1,206 @@ -2006-04-07 Adam Jackson <[EMAIL PROTECTED]> +commit 4b97b50a48eb0b3a978d7d4fb082e07f51363953 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Thu Mar 1 10:57:05 2007 -0800 - * configure.ac: - * src/bw2.h: - * src/bw2_driver.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Replace references to XFree86/XF86Config in man page -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0d47924bba0872ce4c6cadedff6783be3ce03f86 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Fri Apr 7 21:14:47 2006 +0000 - * configure.ac: - Update package version for X11R7 release. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a9e83a10f9bfd354af448c20b41d0c85db7e489d +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:30:02 2005 +0000 - * configure.ac: - Update package version number for final X11R7 release candidate. + Update package version for X11R7 release. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 4280411ea6cde6fb83bcd1a5c4ffdb9edb65b584 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:25:54 2005 +0000 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Stub COPYING files -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3d09376f24adbaee6b9ecc32b7cd62d85a20d81d +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:19 2005 +0000 - * configure.ac: - Update package version number for X11R7 RC3 release. + Update package version number for final X11R7 release candidate. -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit f62998bd7d5242ea8500b8ecdf98a00ae9d6da7b +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:38 2005 +0000 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. -2005-11-29 Adam Jackson <[EMAIL PROTECTED]> +commit e71465a26f2ea17df369b61b3593af53647be44d +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:35 2005 +0000 - * configure.ac: - Only build dlloader modules by default. + Update package version number for X11R7 RC3 release. -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6e9e610b980c344b1aea90bd46243847d75ca4e0 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Dec 2 02:16:10 2005 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Remove extraneous AC_MSG_RESULT. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e885f2e1d490ce03100b7a6b5303e2f96b1ee0f5 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Nov 29 23:30:03 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Only build dlloader modules by default. + +commit 8d246d8f1918261607d222d1bf34c9eb803718e8 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:04:12 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 ed18e9e6384588d13d1df91d66d4ec3a6d5903a4 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:49:18 2005 +0000 + + Add .cvsignores for drivers. + +commit ed56be8720b4efeb130f6fc8bca10ea63cfbaa2d +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Nov 9 21:15:21 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 4fbc319845b783edc266fdf1e881b234f989b59a +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Nov 1 15:08:54 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit f8409577df0014ca9c6c4cd79de46c82eba61d43 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:48:04 2005 +0000 + + Update package version number for RC1 release. + +commit 37293998bfbd161401556346bb16dc573ff4dad9 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +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 83ab692c845987d10d9e70601b7a6ff2850115ba +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Oct 17 22:57:36 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit dfdd13ceed3ef859f0a53e97195f433747f92f54 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 00:09:06 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit ed9067fb86b53aeb41b7cbbc4407380740b29760 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Thu Aug 18 09:03:49 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit e67b0967f9b7b74bf51ba6be7b5f7854c09bfc54 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:45 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 174b6cb841f2d238d5e540a5706634bc99f075ee +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Tue Jul 26 23:05:10 2005 +0000 + + Build system for sunbw2 + +commit 36fd43981c07fdeb21baae5014c05a8a860ab067 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Jul 11 02:30:00 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit 272bb666f64168eea63bc02f0ee55216fd35a2ad +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Sat Jun 25 21:16:56 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit c0d8343ed4f9a1c7c74f1ac46c278918e6de8092 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Wed Apr 20 12:25:30 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 761e6a19501473ca3d7c75514b64a8143bf43d79 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Jun 16 09:23:55 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit cde3b2263ac4c74996792b55449ec949f9dc315d +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:46:10 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e3be35b5f88777ea2c63cb7c7869623ac0616fc6 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:33:36 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 896a21d1fd0fc3a04707755673a09e05d6cbf48a +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:12:25 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ae76bd203e7991467fb9378bbd178fb6bbd81f58 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:35:55 2004 +0000 + + readding XFree86's cvs IDs + +commit 7aa726f59c686b21cdcd9ab481d16e7e58c121d6 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:23:25 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 36716ad167f0c3871903196e7e1ba3c7f0d3a5df +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Tue Nov 25 19:28:40 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit c78ca63d2b8dd9074f7b6ff986ebeb4061697c1b +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit 32298a26a93179551d754209d9dab3fb77019c0e +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision diff --git a/debian/changelog b/debian/changelog index f539453..86652f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-sunbw2 (1:1.1.0-5) UNRELEASED; urgency=low the user's config and log files. [ Brice Goglin ] + * Pull upstream manpage fix 4b97b50a48eb0b3a978d7d4fb082e07f51363953 * Install the upstream changelog. * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 (needed to let xsfbs get access to serverminver). commit 3fe096ae18918b848fcf4a266fc37aca27ea8e5b Author: Brice Goglin <[EMAIL PROTECTED]> Date: Tue May 1 13:49:40 2007 +0200 Miscellaneous fixed in debian/control and debian/rules. * Install the upstream changelog. * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 (needed to let xsfbs get access to serverminver). * Add XS-Vcs-*. * Add a link to www.X.org and a reference to the xf86-video-sunbw2 module in the long description. * Remove Fabio from uploaders with his permission. He's always welcome back. diff --git a/debian/changelog b/debian/changelog index fb5e65a..f539453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,25 @@ -xserver-xorg-video-sunbw2 (1:1.1.0-4) experimental; urgency=low +xserver-xorg-video-sunbw2 (1:1.1.0-5) UNRELEASED; urgency=low - * Generate server dependencies automatically from the ABI + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. - -- David Nusinow <[EMAIL PROTECTED]> Wed, 21 Feb 2007 22:54:36 -0500 + [ Brice Goglin ] + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-sunbw2 + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. -xserver-xorg-video-sunbw2 (1:1.1.0-3) UNRELEASED; urgency=low + -- Brice Goglin <[EMAIL PROTECTED]> Tue, 01 May 2007 13:48:36 +0200 - * Add link to xserver-xorg-core bug script, so that bugreports contain - the user's config and log files. - * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous - versions don't have the bug script. +xserver-xorg-video-sunbw2 (1:1.1.0-4) experimental; urgency=low - -- Julien Cristau <[EMAIL PROTECTED]> Tue, 7 Nov 2006 07:30:44 +0100 + * Generate server dependencies automatically from the ABI + + -- David Nusinow <[EMAIL PROTECTED]> Wed, 21 Feb 2007 22:54:36 -0500 xserver-xorg-video-sunbw2 (1:1.1.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 3e3bc20..66db424 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,11 @@ Source: xserver-xorg-video-sunbw2 Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Jurij Smakov <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-core-dev, x11proto-randr-dev +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Jurij Smakov <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev Standards-Version: 3.7.2.0 +XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunbw2 +XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunbw2.git Package: xserver-xorg-video-sunbw2 Architecture: sparc @@ -15,8 +17,8 @@ Description: X.Org X server -- Sun BW2 display driver This package provides the driver for Sun BW2 video devices. . More information about X.Org can be found at: + <URL:http://www.X.org> <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . - This module can be found as the module 'driver/xf86-video-sunbw2' at - :pserver:[EMAIL PROTECTED]:/cvs/xorg + This package is built from the X.org xf86-video-sunbw2 driver module. diff --git a/debian/rules b/debian/rules index d070c06..5d8b44b 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,7 @@ binary-arch: build install serverabi dh_testroot dh_installdocs - dh_installchangelogs + dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp dh_link dh_strip commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow <[EMAIL PROTECTED]> Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver -> serverminver rename diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index cfc5496..0343aec 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -366,7 +366,7 @@ endif .PHONY: serverabi serverabi: -ifeq ($(SERVERABI),) +ifeq ($(SERVERMINVERS),) @echo error: xserver-xorg-dev needs to be installed @exit 1 else commit 4b97b50a48eb0b3a978d7d4fb082e07f51363953 Author: Alan Coopersmith <[EMAIL PROTECTED]> Date: Thu Mar 1 10:57:05 2007 -0800 Replace references to XFree86/XF86Config in man page diff --git a/man/sunbw2.man b/man/sunbw2.man index ac05ccf..953598f 100644 --- a/man/sunbw2.man +++ b/man/sunbw2.man @@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver .fi .SH DESCRIPTION .B sunbw2 -is an XFree86 driver for Sun BW2 video cards. +is an __xservername__ driver for Sun BW2 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B sunbw2 driver supports... .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: Jakub Jelinek <[EMAIL PROTECTED]> commit 9b0b2821ce86e56f5fa86e2cdbb8773d21e647b5 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 28 23:45:04 2007 -0500 Autoreconf diff --git a/Makefile.in b/Makefile.in index 549e9f1..bd3d980 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,6 +129,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -163,13 +164,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ XORG_LIBS = @XORG_LIBS@ -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@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -186,24 +183,31 @@ 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@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ 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 aaed1b9..aaae5ad 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1397,18 +1397,6 @@ 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. @@ -1564,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1578,27 +1566,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1610,7 +1581,7 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) +netbsdelf*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1619,7 +1590,7 @@ knetbsd*-gnu) shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + dynamic_linker='NetBSD ld.elf_so' ;; netbsd*) @@ -2327,7 +2298,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2381,11 +2352,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3133,7 +3104,7 @@ case $host_os in freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3292,7 +3263,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*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -3394,7 +3365,7 @@ case $host_os in ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-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= @@ -4659,7 +4630,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*) +linux* | k*bsd*-gnu) 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'" @@ -4932,7 +4903,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4975,7 +4946,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -5018,7 +4989,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -5229,7 +5200,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5370,6 +5341,9 @@ 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) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5540,7 +5514,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*) + linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5566,12 +5540,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + netbsd* | netbsdelf*-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= @@ -5901,7 +5876,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) _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 @@ -6003,7 +5978,7 @@ _LT_EOF _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-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 @@ -6543,7 +6518,8 @@ installed software in a non-standard prefix. _PKG_TEXT ])], - [$4]) + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it @@ -6562,35 +6538,69 @@ else fi[]dnl ])# PKG_CHECK_MODULES -dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $ dnl -dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. +dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the +dnl "Software"), to deal in the Software without restriction, including +dnl without limitation the rights to use, copy, modify, merge, publish, +dnl distribute, and/or sell copies of the Software, and to permit persons +dnl to whom the Software is furnished to do so, provided that the above +dnl copyright notice(s) and this permission notice appear in all copies of +dnl the Software and that both the above copyright notice(s) and this +dnl permission notice appear in supporting documentation. +dnl dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -dnl +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Except as contained in this notice, the name of a copyright holder +dnl shall not be used in advertising or otherwise to promote the sale, use +dnl or other dealings in this Software without prior written authorization +dnl of the copyright holder. + +# XORG_MACROS_VERSION(required-version) +# ------------------------------------- +# Minimum version: 1.1.0 +# +# If you're using a macro added in Version 1.1 or newer, include this in +# your configure.ac with the minimum required version, such as: +# XORG_MACROS_VERSION(1.1) +# +# To force at least a version with this macro defined, also add: +# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) +# +# +# See the "minimum version" comment for each macro you use to see what +# version you require. +AC_DEFUN([XORG_MACROS_VERSION],[ + [XORG_MACROS_needed_version=$1 + XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` + XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] + AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) + [XORG_MACROS_version=1.1.5 + XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` + XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] + if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then + AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) + fi + if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then + AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) + fi + AC_MSG_RESULT([yes, $XORG_MACROS_version]) +]) # XORG_MACROS_VERSION # XORG_PROG_RAWCPP() # ------------------ +# Minimum version: 1.0.0 +# # Find cpp program and necessary flags for use in pre-processing text files # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ @@ -6633,6 +6643,8 @@ AC_SUBST(RAWCPPFLAGS) # XORG_MANPAGE_SECTIONS() # ----------------------- +# Minimum version: 1.0.0 +# # Determine which sections man pages go in for the different man page types # on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. # Not sure if there's any better way than just hardcoding by OS name. @@ -6642,75 +6654,47 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) if test x$APP_MAN_SUFFIX = x ; then - case $host_os in - linux*) APP_MAN_SUFFIX=1x ;; - *) APP_MAN_SUFFIX=1 ;; - esac + APP_MAN_SUFFIX=1 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]