Update to libXcursor 1.1.10

This commit is contained in:
matthieu 2009-10-31 17:47:06 +00:00
parent f043957069
commit 6a2eaba1d6
17 changed files with 6840 additions and 4755 deletions

View File

@ -1,276 +1,434 @@
2006-06-03 Daniel Stone <daniel@freedesktop.org> commit fbf229879370a96a070ebf087426f6f6c0dbe5a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:49:15 2009 +1000
* configure.ac: libXcursor 1.1.10
* include/X11/Xcursor/Xcursor.h:
Bump to 1.1.7. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* src/file.c: commit 59e3f6520f4d1682d3242d1d5656e7972cf11944
Bug #5268: Fix small memory leak. (Matthias Clasen) Author: Alan Coopersmith <alan.coopersmith@sun.com>
Change some return 0's to NULL. Date: Mon Feb 2 20:34:32 2009 -0800
2006-04-27 Eric Anholt <anholt@FreeBSD.org> Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac: commit f00ae32322d2b3c5d97724b80c72d3e2d0812935
Look for cursors in datadir, not always /usr/share Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:34:11 2009 -0200
2006-04-26 Adam Jackson <ajax@freedesktop.org> Janitor: make distcheck, compiler warnings, extra .gitignore files.
* configure.ac: commit 04641d3cc3e2f7389c5a3ea6e1d55543e033153f
* include/X11/Xcursor/Xcursor.h: Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Bump to 1.1.6 Date: Sun Mar 9 00:34:36 2008 +0100
2006-04-06 Adam Jackson <ajax@freedesktop.org> nuke RCS Ids
* src/display.c: commit 94531dc8f6eff9c9f5cbb18ca6b3d4ff79eec752
Coverity #159: Prevent a possible NULL chase. Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:25 2007 -0500
2006-03-04 Daniel Stone <daniel@freedesktop.org> Replace static ChangeLog with dist-hook to generate from git log
* include/X11/Xcursor/Xcursor.h: commit a4f29e6deef2bf46cae811aaac1f535945cd9fee
Bug #4439: Include Xlib.h. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 24 14:01:07 2007 -0700
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> Version bump: 1.1.9
* configure.ac: commit 5a2601740d04d4180e77695c4b60f2cf5c84be6c
Update package version number for final X11R7 release candidate. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 22 19:40:55 2007 -0700
2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> Make shadow man pages for each function
* xcursor.pc.in: commit fef474da694ea3c1fd184d93cc07bf8d95f89327
Add icondir to xcursor.pc to be used when installing cursors. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 21 19:45:35 2007 -0700
2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> Add XCURSOR_PATH to man page
* configure.ac: commit a9ccf1bd91ad6e06f7b7116efe836c365b68645b
* src/Makefile.am: Author: Alan Coopersmith <alan.coopersmith@sun.com>
Add configure options to allow hard-coded paths to be changed. Date: Tue Aug 21 19:33:00 2007 -0700
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> Use cursorpath found by configure in man page
* man/Makefile.am: commit 110131bd40d0fc042f4a81922372307a1582b591
Change *man_SOURCES ==> *man_PRE to fix autotools warnings. Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat May 12 22:42:08 2007 +0200
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> Added object files to .gitignore.
* configure.ac: commit 3c5d4f591ce0b473af9f693cfe25a1506cc573d6
Update package version number for X11R7 RC3 release. Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat May 12 22:41:27 2007 +0200
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> Store the cursor names in one large string.
This means the compiler doesn't need to place the array in the
read-write sections of the DSO, which means less relocations
when the library is loaded and a smaller memory footprint.
* xcursor.pc.in: commit 8b73dc04111c1910a6467417133a44d0aa29c6ac
Update pkgconfig files to separate library build-time dependencies Author: Adam Jackson <ajax@benzedrine.nwnk.net>
from application build-time dependencies. Date: Fri Oct 13 16:01:17 2006 -0400
2005-11-13 Alan Coopersmith <alan.coopersmith@sun.com> Bump to 1.1.8
* configure.ac: commit 9df9640643fae7b922b18ee219d6d9694345df14
* man/Makefile.am: Author: Alan Coopersmith <alan.coopersmith@sun.com>
Use $(LIB_MAN_SUFFIX) instead of forcing man page into section 3. Date: Tue Oct 10 14:57:16 2006 -0700
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> Fix many sparse warnings: Using plain integer as NULL pointer
* configure.ac: commit b6b9f5885566e4c2df8e3319fe092c22f319983f
Update package version number for X11R7 RC2 release. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 10 13:46:17 2006 -0700
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> Fix lint warning: deallocating a pointer that could be NULL: library.c(266)
* configure.ac: commit d0e12a97849871b0b2af04bf8d7a3839c54b31a8
Update pkgcheck dependencies to work with separate build roots. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 10 13:33:33 2006 -0700
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> Add XORG_WITH_LINT to allow checking code with lint/sparse/etc.
* configure.ac: commit 932965298c244553f303fab3bdf23941cc40bb23
Update package version number for RC1 release. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 6 16:44:37 2006 -0700
2005-07-08 Keith Packard <keithp@keithp.com> Use $prefix & $ICONDIR settings from configure for default path in manpage
(Stop hardcoding /usr/X11R6 & /usr/share in the paths shown.)
* .cvsignore: commit f591196271e53c64e27cf41e5b6ae844a480cb3d
* man/.cvsignore: Author: Alan Coopersmith <alan.coopersmith@sun.com>
* src/.cvsignore: Date: Fri Oct 6 16:22:52 2006 -0700
* src/Makefile.am:
Add .cvsignore files
Switch _la_CFLAGS for AM_CFLAGS to clean up directory
2005-07-07 Keith Packard <keithp@keithp.com> Xcursor.man formatting cleanups
* configure.ac: commit 3c5f5860d6f85230f417ce6af30fc73ab75c437b
* src/Makefile.am: Author: Bart Massey <bart@po8.org>
* xcursor.pc.in: Date: Tue Sep 12 09:02:54 2006 -0700
Make sure XFIXES appears in LIBS line, fix up
other pkg-config usage.
Wed Jun 8 16:43:45 2005 Søren Sandmann <sandmann@redhat.com> Added missing dependency
* configure.ac: Remove all the "not found with pkgconfig" stuff commit c7d048dacf3fce6f3121cf0114fd08bb130130b8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 24 19:21:47 2006 -0700
Tue Feb 8 14:26:32 2005 Owen Taylor <otaylor@redhat.com> Use version number from configure.ac in Xcursor.man instead of "Version 1.0"
* configure.ac: Remove AC_CONFIG_AUX_DIR() commit 8c73ee726016dae6f56195d44339b4729121bcf2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 24 18:42:36 2006 -0700
2004-04-13 Daniel Stone <daniel@freedesktop.org> Add *~ to .gitignore to skip over emacs droppings
* ChangeLog: commit c7886900f180da2c460d0a5926daee787e7258ea
Tag 1.1.3, for xlibs 1.0.1. Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 24 18:42:03 2006 -0700
2004-04-07 Keith Packard <keithp@keithp.com> Man page typo fixes (pimaps, directorys)
reviewed by: Michel Dänzer <michel@daenzer.net> commit e0a501e91c270c0e99a55aa568f6df0d3d6e541d
Author: Chris Wilson <cpwilson@taz.qinetiq.com>
* configure.ac: Date: Sat Aug 12 19:55:44 2006 +0300
Make sure X_CFLAGS/X_LIBS are substituted in the xcursor.pc file
2004-02-24 Fredrik Höglund <fredrik@kde.org> fix leak in header destruction
Fix a couple of if (!foo) free(foo); tests.
* configure.ac: commit 2f08984396552c0719fbc3d3e1148157a1423376
* xcursorint.h: Author: Alan Coopersmith <alan.coopersmith@sun.com>
Make the Xfixes code actually work by including the Xfixes.h Date: Thu Jul 13 14:58:50 2006 -0700
header file.
2004-02-03 Jim Gettys <jg@freedesktop.org> renamed: .cvsignore -> .gitignore
* AUTHORS: Add contents to author's file commit c6f65af419d14a753459a71a671baafd84fa1330
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:23:57 2006 +0000
2004-01-17 Daniel Stone <daniel@fooishbar.org> Bug #5268: Fix small memory leak. (Matthias Clasen). Change some return 0s
* Xcursor.h: to NULL. Bump to 1.1.7.
* configure.ac:
Bump package version to 1.1.2, slated for first fd.o platform release.
2004-01-15 Harold L Hunt II <huntharo@msu.edu> commit 8adc6fe181991af8befb0f365360e9a68357da29
* Makefile.am: Pass -no-undefined to libtool via LDFLAGS. Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 17:26:28 2006 +0000
2003-11-10 Keith Packard <keithp@keithp.com> Look for cursors in datadir, not always /usr/share.
* library.c: (_XcursorBuildThemeDir): commit 3c69a6ef12aa43d5c9cc5cfbd76c6bea1fa2bd00
Make sure the allocated path has space for directory separators Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 27 00:04:48 2006 +0000
2003-10-29 Keith Packard <keithp@keithp.com> Bump to 1.1.6
* Xcursor.h: commit f9bc007d71f58db93b7eadeb8c77d0f90379c620
* configure.ac: Author: Adam Jackson <ajax@nwnk.net>
Bump package version to 1.1.1 and library info to 1.2.0 as Date: Fri Apr 7 00:58:59 2006 +0000
the library exports new name-based APIs and uses Xfixes
2003-10-28 Keith Packard <keithp@keithp.com> Coverity #159: Prevent a possible NULL chase.
* Makefile.am: commit 1f862e619f12b54bee2efbb66f77c750184b191f
* Xcursor.h: Author: Daniel Stone <daniel@fooishbar.org>
* configure.ac: Date: Sat Mar 4 21:00:40 2006 +0000
* cursor.c: (XcursorImagesLoadCursor):
* file.c: (XcursorImagesCreate), (XcursorImagesDestroy),
(XcursorImagesSetName):
* library.c: (XcursorLibraryLoadImages),
(XcursorLibraryLoadCursor):
Add support for XFixes version 2 cursor naming functions
2003-10-16 23:45 fredrik Bug #4439: Include Xlib.h.
* Xcursor-def.cpp, Xcursor.h, configure.ac, library.c: commit 461b3c5c0e47eed1b4abf5189ba92bb70d700fa1
Rename _XcursorLibraryPath() to XcursorLibraryPath() and make Author: Kevin E Martin <kem@kem.org>
it a public function, since it's useful for theme selectors. Date: Thu Dec 15 00:24:29 2005 +0000
Bump version to 1.1.0
2003-05-21 10:21 keithp Update package version number for final X11R7 release candidate.
* Makefile.am, Xcursor.h, configure.ac, xcursorint.h: Package commit aed42762a9fcfcf1b7729dc0a7014ea679d309eb
Xcursor.3, bump version to 1.0.2 Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 9 19:28:41 2005 +0000
2003-05-06 11:20 keithp Add icondir to xcursor.pc to be used when installing cursors.
* ChangeLog: Add initial change log commit 189c9672264c4b62f18f9da9422375b216dc7037
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 17:55:19 2005 +0000
2003-05-06 11:09 keithp Add configure options to allow hard-coded paths to be changed.
* .cvsignore, Makefile.am, Xcursor-def.cpp, Xcursor.3, Xcursor.h, commit b8c92a26d01b14cb9d27cd30d261e24833d0c728
Xcursor.man, cursor.c, display.c, file.c, library.c, xcursorint.h, Author: Kevin E Martin <kem@kem.org>
xlib.c: Update .cvsignore, move manual and install, fix CVS ident Date: Thu Dec 8 17:54:40 2005 +0000
lines
2003-05-06 11:00 keithp Allow hard-coded paths to be configurable.
* configure.ac: replace Xrender test with fragment from Xft commit af09e8d8edb7d68367399336ca3163df4c713ffa
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:42 2005 +0000
2003-05-06 10:52 keithp Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
* Makefile.am: Add xcursorint.h to library sources list commit 47043f5e93df6a806bf298eca309e05159c271df
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:43 2005 +0000
2003-05-06 10:49 keithp Update package version number for X11R7 RC3 release.
* Imakefile, Makefile.am, Xcursor.h, autogen.sh, configure.ac, commit a3ddd7c6aa895dd373a73957f0b18181d7f8f486
file.c, xcursor.pc.in: Convert Xcursor to autotools Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:03:05 2005 +0000
2003-02-21 22:16 dawes 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)
* xlib.c: 941. Fix a problem where a malformed Ximage can cause commit 328e88110f43b18268c1fde62e9ce7247a797699
Xcursor to step Author: Kevin E Martin <kem@kem.org>
outside the image data (#A.1636, Keith Packard, reported by Date: Sat Nov 19 07:15:41 2005 +0000
Michel Dänzer).
2003-02-19 19:13 dawes Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
* display.c: 924. Fix a memory leak in XCloseDisplay, and a commit 54d9a60a1891c1c1938db00d835b8fe0a12327c6
potential race condition Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
when multiple threads attempt to initialize the Xcursor Date: Sun Nov 13 17:59:28 2005 +0000
library
simultaneously (#A.1623, Keith Packard).
2003-02-12 19:09 dawes Use $(LIB_MAN_SUFFIX) instead of forcing man page into section 3.
* Xcursor.man: 880. Fix the Xcursor include path in the man page commit f0dfdfc7b4ee020ffb83a9179b9d4d4a6139b5e1
(#5617, Kevin Brosius). Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:31:19 2005 +0000
2003-01-25 19:22 eich Bump version numbers for X11R6.9/X11R7 RC2.
* Xcursor.h, cursor.c, library.c, xcursorint.h: 787. Add "core" commit c0773eea4b50162ae0b9b624a46079e71b8e49c2
theme to Xcursor to force old behaviour (Keith Packard). Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:19:12 2005 +0000
2002-11-26 21:35 keithp Update package version number for X11R7 RC2 release.
* display.c: Fix XcursorSetTheme to permit NULL theme commit 345cf369206f0a2a03e842a108bd8f068da36d3f
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:11:51 2005 +0000
2002-11-22 18:34 keithp Update pkgcheck dependencies to work with separate build roots.
* Xcursor.h, cursor.c, display.c, xcursorint.h, xlib.c: Add animate commit 7c7bdccde9d2208a9330099e3cd21060c60638be
cursor support, client side Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:26:55 2005 +0000
2002-10-11 10:06 keithp Bug #4244: Make XcursorSetTheme(dpy, NULL) restore the default theme.
(Frederico Mena-Quintero)
* cursor.c: Off by one in XcursorAnimateNext (from Anders Carlsson) commit 4d4de72c697217ac155231d1761db065c9a778ee
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:09 2005 +0000
2002-09-30 15:02 alanh Update package version number for RC1 release.
* Xcursor-def.cpp: add Xv-def.cpp file add $XFree86$ tags commit b1bc7d7328ff2741e1c13151799422fee9e6d0cd
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 13 02:22:47 2005 +0000
2002-09-26 00:52 alanh Use troff macros to prevent cpp eating C comments & #defines that are
supposed to appear in man page output.
* Imakefile: #elif -> #else commit 08ccddfa98d3e4daa9993a206ec0fa3cf9329cd1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 11 01:37:44 2005 +0000
2002-09-25 16:27 alanh Define HAVE_XFIXES
* Xcursor-def.cpp: #5350, add Xcursor-def.cpp commit 7a5e36017905a3b7fe70362dc9712654c816c6a5
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Aug 3 03:28:01 2005 +0000
2002-09-25 09:10 torrey Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
a global configure cache don't get confused.
* Imakefile: Add SharedXcursorReqs for operating systems that commit af4b88bba232af55484e8b82ce8abab6013e985e
require it. Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:51 2005 +0000
2002-09-18 10:11 tsi 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
* file.c: Pacify gcc 3.2 commit b34368c667bd47db56bc7e2b36710a22bc3862b0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 16 06:35:32 2005 +0000
2002-09-05 00:55 keithp Change soversion to 1.0.2 with -version-number.
* display.c: Clean up parsing of option that forces use of core commit 9ffefcd641352900f9bf7cb06cbe04e91714b490
cursors Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 06:13:36 2005 +0000
2002-09-05 00:29 keithp Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
* Xcursor.h, cursor.c, display.c, xcursorint.h, xlib.c: Add commit b5a724c201e0881fcb22738560597e333c39ba12
themeable app-specific cursors. Add dithers for core cursors. Author: Keith Packard <keithp@keithp.com>
Dont theme servers without Render by default Date: Fri Jul 8 05:02:01 2005 +0000
2002-08-28 21:40 keithp Make sure XFIXES appears in LIBS line, fix up other pkg-config usage.
* Imakefile, Xcursor.h, Xcursor.man, config-subst, cursor.c, commit 45b0f06f132347e5eaabbc5ff294bc9016de75dd
display.c, file.c, library.c, xcursor-config.in, xcursor.pc.in, Author: Daniel Stone <daniel@fooishbar.org>
xcursorint.h, xlib.c: Add Xcursor library and Xlib hooks for it Date: Sun Jul 3 07:00:56 2005 +0000
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
commit c010a3f076b2f93e2baf4a9472bf5f132266d2db
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jul 3 00:02:27 2005 +0000
There are no manpages in this directory, so don't try to include them in
EXTRA_DIST. Should fix the build.
Reported by: tinderbox
commit 0881bb3ce0ea793e279fcc8ddd16de6ed7e17471
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 2 06:35:03 2005 +0000
Add appropriate lib*_CFLAGS to Makefile.am's -- fixes build problems
commit caa910e492e4d15208f3d179021687c25a84f36e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 29 18:46:53 2005 +0000
Import Xcursor 1.1.4 from freedesktop.org xlibs tree.
commit e67de73f5ca7ae854c18fa1500c8eaf412b44c6c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 13 16:44:53 2005 +0000
Bug #1043: Fix leak when creating animated cursors.
commit 89e52cde6eaf5e2d46198ee2fa16b67ef7e1dd32
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jun 8 20:51:37 2005 +0000
Remove experiment with calling the man page file 4x
commit 5589b4f6a36f2c039adc81fa4d406574eeef35b3
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jun 8 20:44:18 2005 +0000
Remove all the not found with pkgconfig stuff
commit 4070c0af6c7bfe12218181d56e8e3cbb86006d27
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jun 8 19:15:43 2005 +0000
- Add Xcursor build system
commit 50911b052ce90d41cd0ae71f83352ffa45e7c0a4
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:42:47 2004 +0000
Encoding of numerous files changed to UTF-8
commit cbcf471d9157c88a506cd3f067253c8e64cb8e08
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:40 2004 +0000
Merging XORG-CURRENT into trunk
commit fb1739bd2272fa45d9c04fe40517468a49660b37
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:32:05 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit bfcfbe061fb492f58ee6bd6dc6e90cedd1cccbbb
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:11:23 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit c450b7450372fa2f6660dafcbd3fb7cec9e046df
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:32 2004 +0000
readding XFree86's cvs IDs
commit 79b8e8b996311665ae1fc8fa7e7d38270b3d9570
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:42 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit b39c8ec34b4464f78db534355541a4eb5688a999
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Thu Dec 4 22:02:56 2003 +0000
XFree86 4.3.99.901 (RC 1)
commit 969878fc6fed5e43b4f7e2e3ee46835d93d30dfd
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:09 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 8387908965317cc3cf2072187c20f617609a13b7
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:48 2003 +0000
XFree86 4.3.0.1
commit 3b84b14bf06840d5cd446f2aba495108d23d66d7
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:48 2003 +0000
Initial revision

View File

@ -1,6 +1,4 @@
# #
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:00:27 matthieu Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt # Copyright © 2003 Keith Packard, Noah Levitt
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
@ -28,9 +26,19 @@ AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc pkgconfig_DATA = xcursor.pc
EXTRA_DIST = xcursor.pc.in autogen.sh EXTRA_DIST = xcursor.pc.in
if LINT if LINT
lint: lint:
(cd src && $(MAKE) $(MFLAGS) lint) (cd src && $(MAKE) $(MFLAGS) lint)
endif LINT endif LINT
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -14,8 +14,6 @@
@SET_MAKE@ @SET_MAKE@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:00:27 matthieu Exp $
# #
# Copyright © 2003 Keith Packard, Noah Levitt # Copyright © 2003 Keith Packard, Noah Levitt
# #
@ -104,7 +102,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -121,8 +118,10 @@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@ CXXDEPMODE = @CXXDEPMODE@
@ -132,6 +131,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
@ -142,6 +142,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@ ICONDIR = @ICONDIR@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -165,6 +166,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -175,6 +177,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -183,13 +186,9 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@ XCURSOR_LIBS = @XCURSOR_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ 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_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -206,23 +205,31 @@ build_cpu = @build_cpu@
build_os = @build_os@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@
host_alias = @host_alias@ host_alias = @host_alias@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
@ -231,7 +238,8 @@ SUBDIRS = src man
AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS) AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc pkgconfig_DATA = xcursor.pc
EXTRA_DIST = xcursor.pc.in autogen.sh EXTRA_DIST = xcursor.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -493,6 +501,9 @@ distdir: $(DISTFILES)
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -622,6 +633,7 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am clean-am: clean-generic clean-libtool mostlyclean-am
@ -677,7 +689,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \ check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \ distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \ distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \ distuninstallcheck dvi dvi-am html html-am info info-am \
@ -694,6 +706,13 @@ uninstall-info: uninstall-info-recursive
@LINT_TRUE@lint: @LINT_TRUE@lint:
@LINT_TRUE@ (cd src && $(MAKE) $(MFLAGS) lint) @LINT_TRUE@ (cd src && $(MAKE) $(MFLAGS) lint)
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

View File

@ -0,0 +1,25 @@
libXcursor - X Window System Cursor management library
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/lib/libXcursor
http://cgit.freedesktop.org/xorg/lib/libXcursor
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

9780
lib/libXcursor/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,4 @@
dnl dnl
dnl $Id: configure.ac,v 1.1.1.2 2007/09/18 21:09:33 matthieu Exp $
dnl
dnl Copyright © 2003 Keith Packard dnl Copyright © 2003 Keith Packard
dnl dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -30,19 +28,20 @@ dnl version. This same version number must appear in Xcursor.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h dnl not possible to extract the version number here from Xcursor.h
dnl dnl
AC_INIT([libXcursor],1.1.9,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor]) AC_INIT([libXcursor],1.1.10,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.1) XORG_MACROS_VERSION(1.2)
# Check for progs # Check for progs
AC_PROG_CC AC_PROG_CC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
XORG_CWARNFLAGS
AC_ARG_WITH(icondir, AC_ARG_WITH(icondir,
AC_HELP_STRING([--with-icondir=<path>], AC_HELP_STRING([--with-icondir=<path>],
@ -69,12 +68,13 @@ AC_SUBST([XCURSORPATH_LIST])
# Check for X # Check for X
PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto) PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto)
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes]) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])
XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS"
AC_SUBST(XCURSOR_CFLAGS) AC_SUBST(XCURSOR_CFLAGS)
AC_SUBST(XCURSOR_LIBS) AC_SUBST(XCURSOR_LIBS)
XORG_MANPAGE_SECTIONS XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION XORG_RELEASE_VERSION
XORG_CHANGELOG
dnl Allow checking code with lint, sparse, etc. dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT XORG_WITH_LINT

View File

@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services. # ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure. # NOTE: Changing this file will not affect anything until you rerun configure.
# #
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# Free Software Foundation, Inc. # 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.5.22 VERSION=1.5.26
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# See if we are running on zsh, and set the options which allow our # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
# commands through without removal of \ escapes. if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
if test -n "${ZSH_VERSION+set}" ; then emulate sh
NULLCMD=:
# 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 setopt NO_GLOB_SUBST
else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo. # Check that we have a working $echo.
if test "X$1" = X--no-reexec; then if test "X$1" = X--no-reexec; then
@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand # These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO). # e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode. # We save the old values to restore during execute mode.
if test "${LC_ALL+set}" = set; then lt_env=
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
fi do
if test "${LANG+set}" = set; then eval "if test \"\${$lt_var+set}\" = set; then
save_LANG="$LANG"; LANG=C; export LANG save_$lt_var=\$$lt_var
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
if test -n "$lt_env"; then
lt_env="env $lt_env"
fi fi
# Make sure IFS has a sensible default # Make sure IFS has a sensible default
@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args= preserve_args=
lo2o="s/\\.lo\$/.${objext}/" lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/" o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
##################################### #####################################
# Shell function definitions: # Shell function definitions:
@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \ win32_nmres=`eval $NM -f posix -A $1 | \
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` $SED -n -e '1,100{
/ I /{
s,.*,import,
p
q
}
}'`
case $win32_nmres in case $win32_nmres in
import*) win32_libid_type="x86 archive import";; import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";; *) win32_libid_type="x86 archive static";;
@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;; *) my_xabs=`pwd`"/$my_xlib" ;;
esac esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
my_xdir="$my_gentop/$my_xlib" my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
*" $my_xlib_u "*)
extracted_serial=`expr $extracted_serial + 1`
my_xlib_u=lt$extracted_serial-$my_xlib ;;
*) break ;;
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir" $show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir" $run ${rm}r "$my_xdir"
@ -454,11 +488,12 @@ do
;; ;;
--version) --version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" echo "\
$echo $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO" Copyright (C) 2008 Free Software Foundation, Inc.
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $? exit $?
;; ;;
@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;; *.class) xform=class ;;
*.cpp) xform=cpp ;; *.cpp) xform=cpp ;;
*.cxx) xform=cxx ;; *.cxx) xform=cxx ;;
*.f90) xform=f90 ;; *.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;; *.for) xform=for ;;
*.java) xform=java ;; *.java) xform=java ;;
*.obj) xform=obj ;;
*.sx) xform=sx ;;
esac esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj" $run $rm "$lobj" "$output_obj"
$show "$command" $show "$command"
if $run eval "$command"; then : if $run eval $lt_env "$command"; then :
else else
test -n "$output_obj" && $run $rm $removelist test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE exit $EXIT_FAILURE
@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output" command="$command$suppress_output"
$run $rm "$obj" "$output_obj" $run $rm "$obj" "$output_obj"
$show "$command" $show "$command"
if $run eval "$command"; then : if $run eval $lt_env "$command"; then :
else else
$run $rm $removelist $run $rm $removelist
exit $EXIT_FAILURE exit $EXIT_FAILURE
@ -1131,6 +1168,7 @@ EOF
thread_safe=no thread_safe=no
vinfo= vinfo=
vinfo_number=no vinfo_number=no
single_module="${wl}-single_module"
func_infer_tag $base_compile func_infer_tag $base_compile
@ -1138,8 +1176,9 @@ EOF
for arg for arg
do do
case $arg in case $arg in
-all-static | -static) -all-static | -static | -static-libtool-libs)
if test "X$arg" = "X-all-static"; then case $arg in
-all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi fi
@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static dlopen_self=$dlopen_self_static
fi fi
prefer_static_libs=yes prefer_static_libs=yes
else ;;
-static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static dlopen_self=$dlopen_self_static
fi fi
prefer_static_libs=built prefer_static_libs=built
fi ;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
;;
esac
build_libtool_libs=no build_libtool_libs=no
build_old_libs=yes build_old_libs=yes
break break
@ -1600,7 +1647,7 @@ EOF
continue continue
;; ;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg" compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg" compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg" finalize_command="$finalize_command $arg"
@ -1608,6 +1655,11 @@ EOF
continue continue
;; ;;
-multi_module)
single_module="${wl}-multi_module"
continue
;;
-module) -module)
module=yes module=yes
continue continue
@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC # -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific # -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC # compiler args for GCC
# -pg pass through profiling flag for GCC # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files # @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|@*) -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need # Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later. # to be aesthetically quoted because they are evaled later.
@ -1652,9 +1705,9 @@ EOF
-no-install) -no-install)
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows # The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs. # and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no fast_install=no
@ -1713,7 +1766,7 @@ EOF
continue continue
;; ;;
-static) -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop. # The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that # We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects # didn't have a PIC flag, but the assumption that the effects
@ -2074,17 +2127,6 @@ EOF
;; ;;
esac esac
for pass in $passes; do for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" || if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs" libs="$deplibs"
@ -2106,7 +2148,7 @@ EOF
lib= lib=
found=no found=no
case $deplib in case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs" compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs" finalize_deplibs="$deplib $finalize_deplibs"
@ -2122,7 +2164,12 @@ EOF
continue continue
fi fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do if test "$linkmode" = lib; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do for search_ext in .la $std_shrext .so .a; do
# Search the libtool library # Search the libtool library
lib="$searchdir/lib${name}${search_ext}" lib="$searchdir/lib${name}${search_ext}"
@ -2503,7 +2550,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" && if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then { { test "$prefer_static_libs" = no ||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path # We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories. # Make sure the rpath contains only unique directories.
@ -2916,12 +2965,18 @@ EOF
# we do not want to link against static libs, # we do not want to link against static libs,
# but need to link against shared # but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do for tmp in $deplibrary_names ; do
depdepl=$tmp depdepl=$tmp
done done
if test -f "$path/$depdepl" ; then if test -f "$deplibdir/$depdepl" ; then
depdepl="$deplibdir/$depdepl"
elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl" depdepl="$path/$depdepl"
else
# Can't find it, oh well...
depdepl=
fi fi
# do not add paths which are already there # do not add paths which are already there
case " $newlib_search_path " in case " $newlib_search_path " in
@ -3069,9 +3124,10 @@ EOF
case $linkmode in case $linkmode in
oldlib) oldlib)
if test -n "$deplibs"; then case " $deplibs" in
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 *\ -l* | *\ -L*)
fi $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@ -3199,7 +3255,7 @@ EOF
# which has an extra 1 added just for fun # which has an extra 1 added just for fun
# #
case $version_type in case $version_type in
darwin|linux|osf|windows) darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor` current=`expr $number_major + $number_minor`
age="$number_minor" age="$number_minor"
revision="$number_revision" revision="$number_revision"
@ -3210,9 +3266,10 @@ EOF
age="0" age="0"
;; ;;
irix|nonstopux) irix|nonstopux)
current=`expr $number_major + $number_minor - 1` current=`expr $number_major + $number_minor`
age="$number_minor" age="$number_minor"
revision="$number_minor" revision="$number_minor"
lt_irix_increment=no
;; ;;
esac esac
;; ;;
@ -3271,7 +3328,8 @@ EOF
versuffix="$major.$age.$revision" versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options... # Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1` minor_current=`expr $current + 1`
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;; ;;
freebsd-aout) freebsd-aout)
@ -3285,8 +3343,11 @@ EOF
;; ;;
irix | nonstopux) irix | nonstopux)
major=`expr $current - $age + 1` if test "X$lt_irix_increment" = "Xno"; then
major=`expr $current - $age`
else
major=`expr $current - $age + 1`
fi
case $version_type in case $version_type in
nonstopux) verstring_prefix=nonstopux ;; nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;; *) verstring_prefix=sgi ;;
@ -3437,11 +3498,11 @@ EOF
fi fi
# Eliminate all temporary directories. # Eliminate all temporary directories.
for path in $notinst_path; do #for path in $notinst_path; do
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done #done
if test -n "$xrpath"; then if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them. # If the user specified any rpath flags, then add them.
@ -3542,13 +3603,12 @@ EOF
int main() { return 0; } int main() { return 0; }
EOF EOF
$rm conftest $rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest` ldd_output=`ldd conftest`
for i in $deplibs; do for i in $deplibs; do
name=`expr $i : '-l\(.*\)'` name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument. # If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in case " $predeps $postdeps " in
*" $i "*) *" $i "*)
@ -3587,9 +3647,7 @@ EOF
# If $name is empty we are operating on a -L argument. # If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then if test "$name" != "" && test "$name" != "0"; then
$rm conftest $rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $i if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest` ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in case " $predeps $postdeps " in
@ -3621,7 +3679,7 @@ EOF
droppeddeps=yes droppeddeps=yes
$echo $echo
$echo "*** Warning! Library $i is needed by this library but I was not able to" $echo "*** Warning! Library $i is needed by this library but I was not able to"
$echo "*** make it link in! You will probably need to install it or some" $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully" $echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better." $echo "*** functional. Installing it before continuing would be even better."
fi fi
@ -3907,7 +3965,10 @@ EOF
test -n "$hardcode_libdirs"; then test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs" libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" case $archive_cmds in
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
esac
else else
eval dep_rpath=\"$hardcode_libdir_flag_spec\" eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi fi
@ -4217,9 +4278,10 @@ EOF
;; ;;
obj) obj)
if test -n "$deplibs"; then case " $deplibs" in
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 *\ -l* | *\ -L*)
fi $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@ -4266,12 +4328,14 @@ EOF
reload_conv_objs= reload_conv_objs=
gentop= gentop=
# reload_cmds runs $LD directly, so let us get rid of # reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec # -Wl from whole_archive_flag_spec and hope we can get by with
# turning comma into space..
wl= wl=
if test -n "$convenience"; then if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else else
gentop="$output_objdir/${obj}x" gentop="$output_objdir/${obj}x"
generated="$generated $gentop" generated="$generated $gentop"
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
case $host in case $host in
*cygwin* | *mingw* ) *cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then if test -f "$output_objdir/${outputname}.def" ; then
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else else
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi fi
;; ;;
* ) * )
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;; ;;
esac esac
;; ;;
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
# really was required. # really was required.
# Nullify the symbol file. # Nullify the symbol file.
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification. # Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath" link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now. # We have no uninstalled library dependencies, so finalize right now.
@ -4836,7 +4900,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath" link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then if test "$fast_install" = yes; then
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else else
# fast_install is set to needless # fast_install is set to needless
relink_command= relink_command=
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
fi fi
done done
relink_command="(cd `pwd`; $relink_command)" relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi fi
# Quote $echo for shipping. # Quote $echo for shipping.
@ -5280,6 +5344,20 @@ EOF
Xsed='${SED} -e 1s/^X//' Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst' sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# 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
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@ -5422,7 +5500,7 @@ else
;; ;;
esac esac
$echo >> $output "\ $echo >> $output "\
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE exit $EXIT_FAILURE
fi fi
else else
@ -5608,7 +5686,7 @@ fi\
done done
# Quote the link command for shipping. # Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then if test "$hardcode_automatic" = yes ; then
relink_command= relink_command=
fi fi
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command. # Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else else
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi fi
$echo "$modename: warning: relinking \`$file'" 1>&2 $echo "$modename: warning: relinking \`$file'" 1>&2
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file" outputname="$tmpdir/$file"
# Replace the output file specification. # Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command" $show "$relink_command"
if $run eval "$relink_command"; then : if $run eval "$relink_command"; then :
@ -6345,8 +6423,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir" dir="$dir/$objdir"
else else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 if test ! -f "$dir/$dlname"; then
exit $EXIT_FAILURE $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
fi
fi fi
;; ;;
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
fi fi
# Restore saved environment variables # Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
LC_ALL="$save_LC_ALL"; export LC_ALL do
fi eval "if test \"\${save_$lt_var+set}\" = set; then
if test "${save_LANG+set}" = set; then $lt_var=\$save_$lt_var; export $lt_var
LANG="$save_LANG"; export LANG fi"
fi done
# Now prepare to actually exec the command. # Now prepare to actually exec the command.
exec_cmd="\$cmd$args" exec_cmd="\$cmd$args"
@ -6772,9 +6852,9 @@ The following components of LINK-COMMAND are treated specially:
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE -export-symbols SYMFILE
try to export only the symbols listed in SYMFILE try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX -export-symbols-regex REGEX
try to export only the symbols matching REGEX try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries -LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME -lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened -module build a library that can dlopened
@ -6788,9 +6868,11 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information -release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR -rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-static do not do any dynamic linking of libtool libraries -static do not do any dynamic linking of uninstalled libtool libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]] -version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0] specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored. All other options (arguments beginning with \`-') are ignored.

View File

@ -73,8 +73,10 @@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@ CXXDEPMODE = @CXXDEPMODE@
@ -84,6 +86,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
@ -94,6 +97,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@ ICONDIR = @ICONDIR@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -117,6 +121,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -127,6 +132,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -135,13 +141,9 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@ XCURSOR_LIBS = @XCURSOR_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ 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_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -158,23 +160,31 @@ build_cpu = @build_cpu@
build_os = @build_os@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@
host_alias = @host_alias@ host_alias = @host_alias@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@

View File

@ -96,8 +96,10 @@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@ CXXDEPMODE = @CXXDEPMODE@
@ -107,6 +109,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
@ -117,6 +120,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@ ICONDIR = @ICONDIR@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -140,6 +144,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -150,6 +155,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -158,13 +164,9 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@ XCURSOR_LIBS = @XCURSOR_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ 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_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -181,23 +183,31 @@ build_cpu = @build_cpu@
build_os = @build_os@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host = @host@ host = @host@
host_alias = @host_alias@ host_alias = @host_alias@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@

View File

@ -1,6 +1,4 @@
/* /*
* $Id: cursor.c,v 1.1.1.1 2006/11/25 17:00:28 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its

View File

@ -1,6 +1,4 @@
/* /*
* $Id: display.c,v 1.1.1.1 2006/11/25 17:00:28 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its

View File

@ -1,6 +1,4 @@
/* /*
* $Id: file.c,v 1.1.1.1 2006/11/25 17:00:29 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its

View File

@ -1,6 +1,4 @@
/* /*
* $Id: library.c,v 1.1.1.2 2007/09/18 21:09:55 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
@ -234,7 +232,7 @@ XcursorScanTheme (const char *theme, const char *name)
* Scan this theme * Scan this theme
*/ */
for (path = XcursorLibraryPath (); for (path = XcursorLibraryPath ();
path && f == 0; path && f == NULL;
path = _XcursorNextPath (path)) path = _XcursorNextPath (path))
{ {
dir = _XcursorBuildThemeDir (path, theme); dir = _XcursorBuildThemeDir (path, theme);
@ -261,7 +259,7 @@ XcursorScanTheme (const char *theme, const char *name)
/* /*
* Recurse to scan inherited themes * Recurse to scan inherited themes
*/ */
for (i = inherits; i && f == 0; i = _XcursorNextPath (i)) for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
f = XcursorScanTheme (i, name); f = XcursorScanTheme (i, name);
if (inherits != NULL) if (inherits != NULL)
free (inherits); free (inherits);

View File

@ -1,6 +1,4 @@
/* /*
* $Id: xcursorint.h,v 1.1.1.1 2006/11/25 17:00:28 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its

View File

@ -1,6 +1,4 @@
/* /*
* $Id: xlib.c,v 1.1.1.1 2006/11/25 17:00:29 matthieu Exp $
*
* Copyright © 2002 Keith Packard * Copyright © 2002 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its