Update to libXmu 1.0.5
This commit is contained in:
matthieu
parent
fbfe310e31
commit
c06fd4db3a
@ -1,187 +1,357 @@
|
||||
2006-04-30 Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
commit c2c76abe51878f55e22c44c747f1243e56a4344b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Sep 23 17:53:41 2009 -0700
|
||||
|
||||
* src/Makefile.am
|
||||
Define BITMAPDIR for the case where ${prefix} != /usr
|
||||
libXmu 1.0.5
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2006-04-26 Adam Jackson <ajax@freedesktop.org>
|
||||
commit 5b31bee92b56147e2c17d19e46e09145d765fdb4
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Sep 23 17:49:27 2009 -0700
|
||||
|
||||
* configure.ac:
|
||||
Bump to 1.0.1
|
||||
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2006-03-20 Adam Jackson <ajax@freedesktop.org>
|
||||
commit fef063d82e332b96bcb12ce41abefce868821577
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Sep 23 17:47:16 2009 -0700
|
||||
|
||||
* src/Makefile.am:
|
||||
Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
|
||||
Add pointer to API docs in xorg-docs to README
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 88bd2d387fbb068339b65506331136085082def6
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Tue Mar 31 00:01:48 2009 +0200
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
libXmu: check for LONG64, not LONG_64
|
||||
|
||||
The latter isn't defined anywhere, so editres hasn't been able to read a
|
||||
pointer on 64bit since about 10 years.
|
||||
Admittedly, this should be using stdint types, but...
|
||||
|
||||
Debian bug#521887 <http://bugs.debian.org/521887>
|
||||
|
||||
Reported-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit f1ccbcffc9171868256b5813aa558f6756aca508
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Feb 2 20:34:34 2009 -0800
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Add README with pointers to mailing list, bugzilla & git repos
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 049534f4eb409bea62b590b436bef78e5eef5b8e
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Jan 29 20:02:33 2009 -0200
|
||||
|
||||
* xmu.pc.in:
|
||||
* xmuu.pc.in:
|
||||
Update pkgconfig files to separate library build-time dependencies
|
||||
from application build-time dependencies.
|
||||
* configure.ac:
|
||||
Update dependencies to work with separate build roots.
|
||||
Janitor: make distcheck, compiler warnings, .gitignore.
|
||||
|
||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit fc2096538ff7424bfeb171b1a36e860070594627
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Aug 4 19:42:22 2008 -0700
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for RC1 release.
|
||||
Add libX11 to libXmu dependencies
|
||||
|
||||
2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 85f77401635dfa57d40de89aa2c9f39a344a8d3b
|
||||
Author: Colin Harrison <colin.harrison-at-virgin.net>
|
||||
Date: Tue Apr 29 13:13:06 2008 +0100
|
||||
|
||||
* Makefile.am:
|
||||
Add missing file to EXTRA_DIST
|
||||
Fix build problems on WIN32 platforms
|
||||
|
||||
2005-07-08 Keith Packard <keithp@keithp.com>
|
||||
commit aa6e9793fbb8621ce1f1ed580298621e29638619
|
||||
Author: Colin Harrison <colin.harrison-at-virgin.net>
|
||||
Date: Sat Apr 26 08:51:54 2008 +0100
|
||||
|
||||
* .cvsignore:
|
||||
* include/.cvsignore:
|
||||
* src/.cvsignore:
|
||||
Add .cvsignore files
|
||||
Switch to winsock2
|
||||
|
||||
2005-05-21 Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
commit cbfab9d91e17239084ab24b99751bdd1610fcc1b
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Mar 9 08:32:59 2008 +0100
|
||||
|
||||
* configure.ac:
|
||||
Add XTRANS_CONNECTION_FLAGS to get network transport #defines
|
||||
for CvdStdSel.c
|
||||
* src/Makefile.am:
|
||||
Add libXmuu_la_LIBADD
|
||||
nuke RCS Ids
|
||||
|
||||
2005-01-29 Daniel Stone <daniel@freedesktop.org>
|
||||
commit 3fe753215b6186e588246220a473417810f82b05
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Feb 28 18:55:23 2008 -0300
|
||||
|
||||
* CvtStdSel.c (get_os_name):
|
||||
Change uname == 0 to uname >= 0 (X.Org HEAD).
|
||||
Compile warning fix by using Cardinal instead of int.
|
||||
|
||||
This also matches the function prototype.
|
||||
|
||||
* include/X11/Xmu/SysUtil.h:
|
||||
* include/X11/Xmu/Xmu.h:
|
||||
Add gcc format attribute (X.Org HEAD).
|
||||
commit e2735131202e7801e72ce33def666b6a0a543e26
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Jan 14 14:11:43 2008 -0800
|
||||
|
||||
2005-01-01 Phil Blundell <philb@gnu.org>
|
||||
Version bump: 1.0.4
|
||||
|
||||
* configure.ac (XMUU_CFLAGS, XMUU_LIBS): New.
|
||||
* xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS.
|
||||
commit f11b5a161944dc694ee059f88acb20826bd6d90b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Jan 14 11:21:36 2008 -0800
|
||||
|
||||
2004-05-17 Eric Anholt <anholt@FreeBSD.org>
|
||||
Coverity #52: Dead code in get_os_name()
|
||||
|
||||
* EditresCom.c:
|
||||
* WidgetNode.c: (XmuWnFetchResources):
|
||||
Axe the Xaw header dependency again.
|
||||
commit 6f5ea6a2a0b56674f08f58d95085c0e9a8797fe2
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Sun Jan 13 01:58:12 2008 -0800
|
||||
|
||||
2004-05-10 Eric Anholt <anholt@FreeBSD.org>
|
||||
Clear sparse warnings: Using plain integer as NULL pointer
|
||||
|
||||
* configure.ac:
|
||||
* xmu.pc.in:
|
||||
* xmuu.pc.in:
|
||||
Properly include LIBS/CFLAGS in .pc and linking.
|
||||
Bump to version 6.2.3.
|
||||
commit 6f76ccc70a5f5ae834a3e63c9f4f35704837a4d1
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 11 20:43:26 2008 -0800
|
||||
|
||||
2004-04-13 Daniel Stone <daniel@freedesktop.org>
|
||||
Add hooks for checking sources with tools like lint & sparse
|
||||
|
||||
* EditresCom.c:
|
||||
X11R6.7 merge - various minor cleanups.
|
||||
commit 43ec402bcd6a2333a4e213de3a82d7e3392b0fb0
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:38:32 2007 -0500
|
||||
|
||||
* Bump version to 6.2.2 for xlibs 1.0.1.
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
2004-03-17 Carlos Romero <kidcrash@bellsouth.net>
|
||||
commit 7e35135e9ad1ea2ef101402ea26bec62c3cbb69a
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:53:43 2007 -0400
|
||||
|
||||
(Commit sponsored by Daniel Stone.)
|
||||
* Makefile.am:
|
||||
* xmu.pc.in:
|
||||
* configure.ac:
|
||||
Various cleanups to build system, including correct use of pkg-config.
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit a3e01af0f4b56b3b8891040cf0f7208265bbea2a
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Wed Nov 8 20:01:35 2006 +0200
|
||||
|
||||
* ChangeLog
|
||||
Caught up on all missing by me starting Dec. 16.
|
||||
bump to 1.0.3
|
||||
|
||||
2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 7beb4c2909af805e61d073a6f2b93234eb91834d
|
||||
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
|
||||
Date: Fri Oct 13 16:22:06 2006 -0400
|
||||
|
||||
* Makefile.am
|
||||
* configure.ac
|
||||
Fix versions for Xmu and Xmuu libraries. Using
|
||||
-version-number 6:2:1 for Xmu. And using -version-info
|
||||
1:0:1 for Xmuu. (This may be out of order, need to test
|
||||
again.)
|
||||
Bump to 1.0.2
|
||||
|
||||
2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 339368b404a807d1c494b260314da16d044986ff
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jul 13 14:59:01 2006 -0700
|
||||
|
||||
* configure.ac
|
||||
* xmu.pc.in
|
||||
* xmuu.pc.in
|
||||
Fix LIBS and CFLAGS for xmuu.pc.in and xmu.pc.in. Also use
|
||||
pkgconfig info for Xt for xmu.pc.in.
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 60620a4b7eeb004e55ba57aef8df33f6adc930f0
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Mon Jul 3 19:33:05 2006 +0200
|
||||
|
||||
* EditresCom.c
|
||||
* WidgetNode.c
|
||||
Get rid of X11/Xaw/Cardinals.h include. Xmu should
|
||||
not depend on Xaw to build, because Xaw needs many Xmu
|
||||
functions to build. In WidgetNode.c, define ZERO (which
|
||||
X11/Xaw/Cardinals.h would define).
|
||||
Added README missing from CVS conversion.
|
||||
|
||||
2003-12-17 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 05a5c96fcef9822ff3c0312427d2c2672f73b551
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Apr 30 14:22:53 2006 +0000
|
||||
|
||||
* Makefile.am
|
||||
Don't repeat source filenames for both Xmu and Xmuu.
|
||||
Just list in libXmuu_la_SOURCES; and use that variable in
|
||||
the libXmu_la_SOURCES list. (As suggested by keithp on
|
||||
xlibs@ list.)
|
||||
Define BITMAPDIR for the case where ${prefix} != /usr
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 0aa6a46099fb319c82da51b8a73566007ad5acbd
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu Apr 27 00:18:38 2006 +0000
|
||||
|
||||
* .cvsignore
|
||||
Add two ltconfig related files for CVS to ignore.
|
||||
Bump to 1.0.1
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 7bb6398aa024d782706125bebd93468f9cc8a0ec
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Mar 20 19:57:04 2006 +0000
|
||||
|
||||
* Lower.c
|
||||
Comment out snprintf.c include. (Maybe as a temporary
|
||||
workaround.) Later, maybe have autoconf check for it.
|
||||
Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 78ab364fec59fa84ac914d51628dfb8ac4a048a5
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:30 2005 +0000
|
||||
|
||||
* INSTALL
|
||||
Add autoconf (./configure) INSTALL instructions.
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 1d93f5a9968e6e9af8f15c60107b1691009d1bd8
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:44 2005 +0000
|
||||
|
||||
* AUTHORS
|
||||
* COPYING
|
||||
* ChangeLog
|
||||
* Makefile.am
|
||||
* NEWS
|
||||
* autogen.sh
|
||||
* configure.ac
|
||||
* xmu.pc.in
|
||||
* xmuu.pc.in
|
||||
Add beginnings of autoconf/automake/pkgconfig framework for Xmu
|
||||
and mini Xmu (Xmuu).
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 5a807bcce047a8072db2c0cef05a84aa6e6cd3ca
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Nov 19 07:15:42 2005 +0000
|
||||
|
||||
* include/Makefile.am
|
||||
Using automake/autoconf for headers. (Note that
|
||||
headers from original xc/Xmu were moved in CVS to this
|
||||
Xmu/include/X11/Xmu/ directory.)
|
||||
Update pkgconfig files to separate library build-time dependencies from
|
||||
application build-time dependencies, and update package deps to work
|
||||
with separate build roots.
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit c50ca633b633d25ba672fb19ac182cea40242069
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:11 2005 +0000
|
||||
|
||||
* include/.cvsignore
|
||||
Add .cvsignore for CVS to ignore Makefile and Makefile.in.
|
||||
Update package version number for RC1 release.
|
||||
|
||||
2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 5 19:57:36 2005 +0000
|
||||
|
||||
* .cvsignore
|
||||
Add .cvsignore to list files that should be ignored by CVS.
|
||||
Add missing file to EXTRA_DIST
|
||||
|
||||
commit bf4087e453d8fd83630976cd6e7e31c63737a4a1
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon Oct 3 20:55:36 2005 +0000
|
||||
|
||||
Remvoe README file that is symlinked from monolith
|
||||
|
||||
commit 82b5da0b34780df3fe91c4b617cb541ee767d794
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sat Jul 30 19:15:16 2005 +0000
|
||||
|
||||
Add -D flags to clear various warnings (Stefan Dirsch)
|
||||
|
||||
commit 43f43567e3c8c63f6b70d7e529827cd5f15e15d3
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:52 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 e9ee49d99a20458e5f36bba48a7ea65bb5230a8d
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Sat Jul 16 07:16:27 2005 +0000
|
||||
|
||||
Set soversions to 6.2.0 and 1.0.0 with -version-number.
|
||||
|
||||
commit 81f5815d0c42b7065eb8e5aeef8e115e7398128f
|
||||
Author: Keith Packard <keithp@keithp.com>
|
||||
Date: Sat Jul 9 06:43:26 2005 +0000
|
||||
|
||||
Add .cvsignore files
|
||||
|
||||
commit 56ef5803a7def4f0d08ce8863e317b250c9c0ce4
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Sun Jul 3 07:00:57 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 5a64c1de0a1d620039afbb0805ae23f10470e815
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sun May 22 19:06:20 2005 +0000
|
||||
|
||||
Add XTRANS_CONNECTION_FLAGS to get network transport #defines for
|
||||
CvdStdSel.c
|
||||
Add libXmuu_la_LIBADD
|
||||
|
||||
commit 506a8f64c84b3db3ad64d03ee698c1de227247de
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sun May 22 04:36:38 2005 +0000
|
||||
|
||||
Move #ifdef HAVE_CONFIG_H outside of #ifdef SYSVNET
|
||||
|
||||
commit 9ca353477c403ab1341e994a5a42a998d29e9a58
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu May 19 00:22:32 2005 +0000
|
||||
|
||||
revert last change, didn't do right thing at all, sorry for the noise
|
||||
|
||||
commit 0a662934f050cff90e82d463ec809c3758b260b1
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu May 19 00:10:08 2005 +0000
|
||||
|
||||
Require automake 1.7 in AM_INIT_AUTOMAKE
|
||||
|
||||
commit 2e403190ff21b0bb277391a73741cfc6d5005ac3
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed May 18 19:38:36 2005 +0000
|
||||
|
||||
- Add Xmu build system
|
||||
|
||||
commit 7cea083d37cfaaad321bddca0fb75b3308956938
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed May 18 19:30:41 2005 +0000
|
||||
|
||||
- Add Xmu to symlink.sh
|
||||
- Conditionally include config.h in Xmu sources
|
||||
|
||||
commit ab0973b4595cfe27c81202bfb4a148780b05bb02
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Wed Dec 22 08:28:16 2004 +0000
|
||||
|
||||
Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment
|
||||
#1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to
|
||||
uname should not check for return == 0, but for >= 0 instead
|
||||
|
||||
commit ece6cefc8e0238071f89de520d4a969fede53bd6
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Tue May 18 04:45:29 2004 +0000
|
||||
|
||||
Remove Xaw header dependency from Xmu library build.
|
||||
http://freedesktop.org/cgi-bin/bugzilla/attachment.cgi?bugid=634
|
||||
|
||||
commit 51156051e17f4ec53cbfe34f3a79f38d5884b78d
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 18:43:45 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit 832c5a7d7b07b88f6468daabae56d9daeeee0db8
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:32:24 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit 410cf462f4a8733c58303de686f07fbd98f2e30e
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:11:29 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit b00bc81852e56578939fb4d63796f8e0cd187cbf
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:35:33 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit aa59d04a1a50b5978e886c2e7248f77bea515ce0
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:22:44 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit 0d10732a71487293bd70c2675ced6bffb6093c8d
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Jan 29 08:08:06 2004 +0000
|
||||
|
||||
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
|
||||
|
||||
commit 6b975651aef1797eb795bd876486c565c52f66fd
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:28:15 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 865329b4e079334b4cb846347ab9a572ac946228
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:49 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 709dda59a506e0c4ad17b085aa381f35cd86176f
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:49 2003 +0000
|
||||
|
||||
Initial revision
|
||||
|
||||
commit e3925d3087dc381a24b47c5602e086645e942fcf
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:39 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:27:50 matthieu Exp $
|
||||
|
||||
SUBDIRS = include src
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
@ -8,5 +6,19 @@ pkgconfig_DATA = xmu.pc xmuu.pc
|
||||
EXTRA_DIST = \
|
||||
xmu.pc.in \
|
||||
xmuu.pc.in \
|
||||
autogen.sh \
|
||||
include/X11/Xmu/WhitePoint.h
|
||||
include/X11/Xmu/WhitePoint.h \
|
||||
ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
if LINT
|
||||
# Check source code with tools like lint & sparse
|
||||
lint:
|
||||
(cd src && $(MAKE) $(MFLAGS) lint)
|
||||
endif LINT
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:27:50 matthieu Exp $
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -83,11 +81,14 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@ -96,8 +97,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -105,6 +108,9 @@ CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
@ -113,6 +119,9 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAS_SNPRINTF = @HAS_SNPRINTF@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@ -122,12 +131,25 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINT = @LINT@
|
||||
LINTLIB = @LINTLIB@
|
||||
LINTLIBUU = @LINTLIBUU@
|
||||
LINT_FALSE = @LINT_FALSE@
|
||||
LINT_FLAGS = @LINT_FLAGS@
|
||||
LINT_TRUE = @LINT_TRUE@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
|
||||
MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
@ -138,6 +160,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
@ -146,13 +169,9 @@ XMUU_CFLAGS = @XMUU_CFLAGS@
|
||||
XMUU_LIBS = @XMUU_LIBS@
|
||||
XMU_CFLAGS = @XMU_CFLAGS@
|
||||
XMU_LIBS = @XMU_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@
|
||||
@ -169,23 +188,31 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -196,9 +223,10 @@ pkgconfig_DATA = xmu.pc xmuu.pc
|
||||
EXTRA_DIST = \
|
||||
xmu.pc.in \
|
||||
xmuu.pc.in \
|
||||
autogen.sh \
|
||||
include/X11/Xmu/WhitePoint.h
|
||||
include/X11/Xmu/WhitePoint.h \
|
||||
ChangeLog
|
||||
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -462,6 +490,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-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 -400 -exec chmod a+r {} \; -o \
|
||||
@ -591,6 +622,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-recursive
|
||||
|
||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||
@ -646,7 +678,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||
check-am clean clean-generic clean-libtool clean-recursive \
|
||||
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-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
@ -660,6 +692,17 @@ uninstall-info: uninstall-info-recursive
|
||||
uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
# Check source code with tools like lint & sparse
|
||||
@LINT_TRUE@lint:
|
||||
@LINT_TRUE@ (cd src && $(MAKE) $(MFLAGS) lint)
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -2,7 +2,34 @@ This library contains miscellaneous utilities and is not part of the Xlib
|
||||
standard. It contains routines which only use public interfaces so that it
|
||||
may be layered on top of any proprietary implementation of Xlib or Xt.
|
||||
|
||||
It is intended to support clients in the MIT distribution; vendors
|
||||
It is intended to support clients in the X.Org distribution; vendors
|
||||
may choose not to distribute this library if they wish. Therefore,
|
||||
applications developers who depend on this library should be prepared to
|
||||
treat it as part of their software base when porting.
|
||||
|
||||
API documentation for this library is provided in the xorg-docs module,
|
||||
in the file specs/Xmu/Xmu.ms.
|
||||
|
||||
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/libXmu
|
||||
|
||||
http://cgit.freedesktop.org/xorg/lib/libXmu
|
||||
|
||||
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
|
||||
|
||||
|
||||
1260
lib/libXmu/aclocal.m4
vendored
1260
lib/libXmu/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -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 "$@"
|
||||
@ -12,9 +12,15 @@
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
|
||||
#undef HAVE_LIBWS2_32
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if the system has the type `socklen_t'. */
|
||||
#undef HAVE_SOCKLEN_T
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
|
||||
11737
lib/libXmu/configure
vendored
11737
lib/libXmu/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
||||
AC_PREREQ(2.57)
|
||||
|
||||
AC_INIT([libXmu],
|
||||
1.0.3,
|
||||
1.0.5,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
libXmu)
|
||||
|
||||
@ -15,14 +15,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_CC
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XMU, xt xext xextproto)
|
||||
PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
|
||||
AC_SUBST(XMU_CFLAGS)
|
||||
AC_SUBST(XMU_LIBS)
|
||||
|
||||
@ -51,7 +56,11 @@ XTRANS_CONNECTION_FLAGS
|
||||
AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()])
|
||||
AC_SUBST(HAS_SNPRINTF)
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
dnl Allow checking code with lint, sparse, etc.
|
||||
XORG_WITH_LINT
|
||||
XORG_LINT_LIBRARY([Xmu])
|
||||
LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
|
||||
AC_SUBST(LINTLIBUU)
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
include/Makefile
|
||||
|
||||
@ -61,9 +61,13 @@ ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@ -72,8 +76,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -81,6 +87,9 @@ CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
@ -89,6 +98,9 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAS_SNPRINTF = @HAS_SNPRINTF@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@ -98,12 +110,25 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINT = @LINT@
|
||||
LINTLIB = @LINTLIB@
|
||||
LINTLIBUU = @LINTLIBUU@
|
||||
LINT_FALSE = @LINT_FALSE@
|
||||
LINT_FLAGS = @LINT_FLAGS@
|
||||
LINT_TRUE = @LINT_TRUE@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
|
||||
MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
@ -114,6 +139,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
@ -122,13 +148,9 @@ XMUU_CFLAGS = @XMUU_CFLAGS@
|
||||
XMUU_LIBS = @XMUU_LIBS@
|
||||
XMU_CFLAGS = @XMU_CFLAGS@
|
||||
XMU_LIBS = @XMU_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@
|
||||
@ -145,23 +167,31 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# ltmain.sh - Provide generalized library-building support services.
|
||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||
# 2007, 2008 Free Software Foundation, Inc.
|
||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
@ -43,14 +43,22 @@ EXIT_FAILURE=1
|
||||
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5.22
|
||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
||||
VERSION=1.5.26
|
||||
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
|
||||
# commands through without removal of \ escapes.
|
||||
if test -n "${ZSH_VERSION+set}" ; then
|
||||
# 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
|
||||
|
||||
# Check that we have a working $echo.
|
||||
if test "X$1" = X--no-reexec; then
|
||||
@ -105,11 +113,19 @@ esac
|
||||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
# We save the old values to restore during execute mode.
|
||||
if test "${LC_ALL+set}" = set; then
|
||||
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
||||
fi
|
||||
if test "${LANG+set}" = set; then
|
||||
save_LANG="$LANG"; LANG=C; export LANG
|
||||
lt_env=
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${$lt_var+set}\" = set; then
|
||||
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
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
@ -136,6 +152,8 @@ duplicate_deps=no
|
||||
preserve_args=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
extracted_archives=
|
||||
extracted_serial=0
|
||||
|
||||
#####################################
|
||||
# Shell function definitions:
|
||||
@ -196,7 +214,13 @@ func_win32_libid ()
|
||||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
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
|
||||
import*) win32_libid_type="x86 archive import";;
|
||||
*) win32_libid_type="x86 archive static";;
|
||||
@ -327,7 +351,17 @@ func_extract_archives ()
|
||||
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||
esac
|
||||
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"
|
||||
$run ${rm}r "$my_xdir"
|
||||
@ -454,11 +488,12 @@ do
|
||||
;;
|
||||
|
||||
--version)
|
||||
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
|
||||
$echo
|
||||
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
|
||||
$echo "This is free software; see the source for copying conditions. There is NO"
|
||||
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
echo "\
|
||||
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
||||
|
||||
Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
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 $?
|
||||
;;
|
||||
|
||||
@ -755,9 +790,11 @@ if test -z "$show_help"; then
|
||||
*.class) xform=class ;;
|
||||
*.cpp) xform=cpp ;;
|
||||
*.cxx) xform=cxx ;;
|
||||
*.f90) xform=f90 ;;
|
||||
*.[fF][09]?) xform=[fF][09]. ;;
|
||||
*.for) xform=for ;;
|
||||
*.java) xform=java ;;
|
||||
*.obj) xform=obj ;;
|
||||
*.sx) xform=sx ;;
|
||||
esac
|
||||
|
||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||
@ -926,7 +963,7 @@ EOF
|
||||
$run $rm "$lobj" "$output_obj"
|
||||
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
test -n "$output_obj" && $run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
@ -998,7 +1035,7 @@ EOF
|
||||
command="$command$suppress_output"
|
||||
$run $rm "$obj" "$output_obj"
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
$run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
@ -1131,6 +1168,7 @@ EOF
|
||||
thread_safe=no
|
||||
vinfo=
|
||||
vinfo_number=no
|
||||
single_module="${wl}-single_module"
|
||||
|
||||
func_infer_tag $base_compile
|
||||
|
||||
@ -1138,8 +1176,9 @@ EOF
|
||||
for arg
|
||||
do
|
||||
case $arg in
|
||||
-all-static | -static)
|
||||
if test "X$arg" = "X-all-static"; then
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
-all-static)
|
||||
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
|
||||
fi
|
||||
@ -1147,12 +1186,20 @@ EOF
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
else
|
||||
;;
|
||||
-static)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
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_old_libs=yes
|
||||
break
|
||||
@ -1600,7 +1647,7 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@ -1608,6 +1655,11 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
-multi_module)
|
||||
single_module="${wl}-multi_module"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@ -1621,10 +1673,11 @@ EOF
|
||||
# -m* pass through architecture-specific compiler args for GCC
|
||||
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
||||
# 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
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
|
||||
-t[45]*|-txscale*|@*)
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
||||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
||||
|
||||
# Unknown arguments in both finalize_command and compile_command need
|
||||
# to be aesthetically quoted because they are evaled later.
|
||||
@ -1652,9 +1705,9 @@ EOF
|
||||
|
||||
-no-install)
|
||||
case $host in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
|
||||
# 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: assuming \`-no-fast-install' instead" 1>&2
|
||||
fast_install=no
|
||||
@ -1713,7 +1766,7 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
-static | -static-libtool-libs)
|
||||
# The effects of -static are defined in a previous loop.
|
||||
# We used to do the same as -all-static on platforms that
|
||||
# didn't have a PIC flag, but the assumption that the effects
|
||||
@ -2074,17 +2127,6 @@ EOF
|
||||
;;
|
||||
esac
|
||||
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" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
@ -2106,7 +2148,7 @@ EOF
|
||||
lib=
|
||||
found=no
|
||||
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
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
@ -2122,7 +2164,12 @@ EOF
|
||||
continue
|
||||
fi
|
||||
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
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
@ -2503,7 +2550,9 @@ EOF
|
||||
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
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
|
||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
@ -2916,12 +2965,18 @@ EOF
|
||||
# we do not want to link against static libs,
|
||||
# but need to link against shared
|
||||
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
|
||||
for tmp in $deplibrary_names ; do
|
||||
depdepl=$tmp
|
||||
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"
|
||||
else
|
||||
# Can't find it, oh well...
|
||||
depdepl=
|
||||
fi
|
||||
# do not add paths which are already there
|
||||
case " $newlib_search_path " in
|
||||
@ -3069,9 +3124,10 @@ EOF
|
||||
|
||||
case $linkmode in
|
||||
oldlib)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
||||
@ -3199,7 +3255,7 @@ EOF
|
||||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
darwin|linux|osf|windows)
|
||||
darwin|linux|osf|windows|none)
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_revision"
|
||||
@ -3210,9 +3266,10 @@ EOF
|
||||
age="0"
|
||||
;;
|
||||
irix|nonstopux)
|
||||
current=`expr $number_major + $number_minor - 1`
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_minor"
|
||||
lt_irix_increment=no
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -3271,7 +3328,8 @@ EOF
|
||||
versuffix="$major.$age.$revision"
|
||||
# Darwin ld doesn't like 0 for these options...
|
||||
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)
|
||||
@ -3285,8 +3343,11 @@ EOF
|
||||
;;
|
||||
|
||||
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
|
||||
nonstopux) verstring_prefix=nonstopux ;;
|
||||
*) verstring_prefix=sgi ;;
|
||||
@ -3437,11 +3498,11 @@ EOF
|
||||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
for path in $notinst_path; do
|
||||
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
done
|
||||
#for path in $notinst_path; do
|
||||
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
#done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
# If the user specified any rpath flags, then add them.
|
||||
@ -3542,13 +3603,12 @@ EOF
|
||||
int main() { return 0; }
|
||||
EOF
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name=`expr $i : '-l\(.*\)'`
|
||||
# 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
|
||||
case " $predeps $postdeps " in
|
||||
*" $i "*)
|
||||
@ -3587,9 +3647,7 @@ EOF
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||
ldd_output=`ldd conftest`
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
@ -3621,7 +3679,7 @@ EOF
|
||||
droppeddeps=yes
|
||||
$echo
|
||||
$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 "*** functional. Installing it before continuing would be even better."
|
||||
fi
|
||||
@ -3907,7 +3965,10 @@ EOF
|
||||
test -n "$hardcode_libdirs"; then
|
||||
libdir="$hardcode_libdirs"
|
||||
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
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||
fi
|
||||
@ -4217,9 +4278,10 @@ EOF
|
||||
;;
|
||||
|
||||
obj)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
||||
@ -4266,12 +4328,14 @@ EOF
|
||||
reload_conv_objs=
|
||||
gentop=
|
||||
# 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=
|
||||
|
||||
if test -n "$convenience"; 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
|
||||
gentop="$output_objdir/${obj}x"
|
||||
generated="$generated $gentop"
|
||||
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
|
||||
case $host in
|
||||
*cygwin* | *mingw* )
|
||||
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}%"`
|
||||
finalize_command=`$echo "X$finalize_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" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
else
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_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" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_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" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
|
||||
# really was required.
|
||||
|
||||
# Nullify the symbol file.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||
# 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"
|
||||
|
||||
# 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
|
||||
link_command="$finalize_var$compile_command$finalize_rpath"
|
||||
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
|
||||
# fast_install is set to needless
|
||||
relink_command=
|
||||
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
|
||||
fi
|
||||
done
|
||||
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
|
||||
|
||||
# Quote $echo for shipping.
|
||||
@ -5280,6 +5344,20 @@ EOF
|
||||
Xsed='${SED} -e 1s/^X//'
|
||||
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
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
@ -5422,7 +5500,7 @@ else
|
||||
;;
|
||||
esac
|
||||
$echo >> $output "\
|
||||
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
||||
\$echo \"\$0: cannot exec \$program \$*\"
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
else
|
||||
@ -5608,7 +5686,7 @@ fi\
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
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
|
||||
relink_command=
|
||||
fi
|
||||
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
|
||||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# 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
|
||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
||||
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
|
||||
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
||||
outputname="$tmpdir/$file"
|
||||
# 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"
|
||||
if $run eval "$relink_command"; then :
|
||||
@ -6345,8 +6423,10 @@ relink_command=\"$relink_command\""
|
||||
if test -f "$dir/$objdir/$dlname"; then
|
||||
dir="$dir/$objdir"
|
||||
else
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
if test ! -f "$dir/$dlname"; then
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
|
||||
fi
|
||||
|
||||
# Restore saved environment variables
|
||||
if test "${save_LC_ALL+set}" = set; then
|
||||
LC_ALL="$save_LC_ALL"; export LC_ALL
|
||||
fi
|
||||
if test "${save_LANG+set}" = set; then
|
||||
LANG="$save_LANG"; export LANG
|
||||
fi
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||
$lt_var=\$save_$lt_var; export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
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
|
||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||
-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
|
||||
try to export only the symbols matching REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
-LLIBDIR search LIBDIR for required installed libraries
|
||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||
-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
|
||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||
-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]]
|
||||
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.
|
||||
|
||||
|
||||
@ -799,8 +799,8 @@ XmuScanline *
|
||||
XmuScanlineNot(XmuScanline *scanline, int minx, int maxx)
|
||||
{
|
||||
XmuSegment *z;
|
||||
static XmuSegment x = { 0, 0, 0 };
|
||||
static XmuScanline and = { 0, &x, 0 };
|
||||
static XmuSegment x = { 0, 0, NULL };
|
||||
static XmuScanline and = { 0, &x, NULL };
|
||||
|
||||
if (!scanline)
|
||||
return (scanline);
|
||||
|
||||
@ -114,7 +114,9 @@ get_os_name(void)
|
||||
#ifdef OS_NAME
|
||||
return XtNewString(OS_NAME);
|
||||
#else
|
||||
#if defined(X_OS_FILE) || defined(MOTD_FILE)
|
||||
FILE *f = NULL;
|
||||
#endif
|
||||
|
||||
#ifdef USE_UNAME
|
||||
struct utsname utss;
|
||||
@ -142,6 +144,7 @@ get_os_name(void)
|
||||
#ifdef MOTD_FILE
|
||||
f = fopen(MOTD_FILE, "r");
|
||||
#endif
|
||||
#if defined(X_OS_FILE) || defined(MOTD_FILE)
|
||||
if (f) {
|
||||
char motd[512];
|
||||
motd[0] = '\0';
|
||||
@ -155,6 +158,7 @@ get_os_name(void)
|
||||
return XtNewString(motd);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef sun
|
||||
return XtNewString("SunOS");
|
||||
|
||||
@ -1611,7 +1611,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
|
||||
unsigned long *widget_list;
|
||||
register int i, num_widgets;
|
||||
|
||||
for (temp = w, i = 0; temp != 0; temp = XtParent(temp), i++)
|
||||
for (temp = w, i = 0; temp != NULL; temp = XtParent(temp), i++)
|
||||
;
|
||||
|
||||
num_widgets = i;
|
||||
@ -2123,7 +2123,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
|
||||
/* try to get the value in the proper size */
|
||||
switch (res->resource_size)
|
||||
{
|
||||
#ifdef LONG_64
|
||||
#ifdef LONG64
|
||||
long v8;
|
||||
#endif
|
||||
int v4;
|
||||
@ -2145,7 +2145,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
|
||||
XtGetValues(w, args, 1);
|
||||
value = (int)v4;
|
||||
break;
|
||||
#ifdef LONG_64
|
||||
#ifdef LONG64
|
||||
case 8:
|
||||
XtSetArg(args[0], res->resource_name, &v8);
|
||||
XtGetValues(w, args, 1);
|
||||
@ -2197,7 +2197,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
|
||||
case sizeof(int):
|
||||
XmuSnprintf(buffer, sizeof(buffer), "0x%08x", (int)value);
|
||||
break;
|
||||
#ifdef LONG_64
|
||||
#ifdef LONG64
|
||||
case sizeof(long):
|
||||
XmuSnprintf(buffer, sizeof(buffer), "0x%016lx", value);
|
||||
break;
|
||||
|
||||
@ -41,6 +41,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <X11/Xlibint.h>
|
||||
#include <X11/Xwinsock.h>
|
||||
#endif
|
||||
|
||||
@ -61,7 +62,7 @@ XmuGetHostname(char *buf, int maxlen)
|
||||
#ifdef WIN32
|
||||
static WSADATA wsadata;
|
||||
|
||||
if (!wsadata.wVersion && WSAStartup(MAKEWORD(1,1), &wsadata))
|
||||
if (!wsadata.wVersion && WSAStartup(MAKEWORD(2,2), &wsadata))
|
||||
return -1;
|
||||
#endif
|
||||
|
||||
|
||||
@ -2,10 +2,12 @@ lib_LTLIBRARIES = libXmu.la libXmuu.la
|
||||
|
||||
BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
|
||||
|
||||
AM_CFLAGS = \
|
||||
AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/include/X11/Xmu \
|
||||
$(XMU_CFLAGS) $(BITMAP_DEFINES) -D_BSD_SOURCE
|
||||
$(BITMAP_DEFINES) -D_BSD_SOURCE
|
||||
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
|
||||
|
||||
libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
|
||||
libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||
@ -62,3 +64,24 @@ libXmu_la_SOURCES = \
|
||||
WidgetNode.c \
|
||||
Xct.c \
|
||||
sharedlib.c
|
||||
|
||||
|
||||
if LINT
|
||||
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS)
|
||||
|
||||
lint:
|
||||
$(LINT) $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) $(XEXT_LIBS)
|
||||
endif LINT
|
||||
|
||||
if MAKE_LINT_LIB
|
||||
lintlibdir = $(libdir)
|
||||
|
||||
lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
|
||||
|
||||
$(LINTLIB): $(libXmu_la_SOURCES)
|
||||
$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
|
||||
|
||||
$(LINTLIBUU): $(libXmuu_la_SOURCES)
|
||||
$(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES)
|
||||
endif MAKE_LINT_LIB
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -51,7 +52,7 @@ am__vpath_adj = case $$p in \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(libdir)"
|
||||
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)"
|
||||
libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
@ -85,13 +86,19 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES)
|
||||
DIST_SOURCES = $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES)
|
||||
lintlibDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(lintlib_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@ -100,8 +107,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -109,6 +118,9 @@ CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
@ -117,6 +129,9 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAS_SNPRINTF = @HAS_SNPRINTF@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@ -126,12 +141,25 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINT = @LINT@
|
||||
LINTLIB = @LINTLIB@
|
||||
LINTLIBUU = @LINTLIBUU@
|
||||
LINT_FALSE = @LINT_FALSE@
|
||||
LINT_FLAGS = @LINT_FLAGS@
|
||||
LINT_TRUE = @LINT_TRUE@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
|
||||
MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
@ -142,6 +170,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
@ -150,13 +179,9 @@ XMUU_CFLAGS = @XMUU_CFLAGS@
|
||||
XMUU_LIBS = @XMUU_LIBS@
|
||||
XMU_CFLAGS = @XMU_CFLAGS@
|
||||
XMU_LIBS = @XMU_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@
|
||||
@ -173,34 +198,43 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
lib_LTLIBRARIES = libXmu.la libXmuu.la
|
||||
BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
|
||||
AM_CFLAGS = \
|
||||
AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/include/X11/Xmu \
|
||||
$(XMU_CFLAGS) $(BITMAP_DEFINES) -D_BSD_SOURCE
|
||||
$(BITMAP_DEFINES) -D_BSD_SOURCE
|
||||
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
|
||||
libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
|
||||
libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||
libXmu_la_LIBADD = $(XMU_LIBS)
|
||||
@ -255,6 +289,11 @@ libXmu_la_SOURCES = \
|
||||
Xct.c \
|
||||
sharedlib.c
|
||||
|
||||
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
|
||||
|
||||
@MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir)
|
||||
@MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -402,6 +441,23 @@ clean-libtool:
|
||||
distclean-libtool:
|
||||
-rm -f libtool
|
||||
uninstall-info-am:
|
||||
install-lintlibDATA: $(lintlib_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(lintlibdir)" || $(mkdir_p) "$(DESTDIR)$(lintlibdir)"
|
||||
@list='$(lintlib_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(lintlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lintlibdir)/$$f'"; \
|
||||
$(lintlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lintlibdir)/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-lintlibDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(lintlib_DATA)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(lintlibdir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(lintlibdir)/$$f"; \
|
||||
done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -480,9 +536,9 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LTLIBRARIES)
|
||||
all-am: Makefile $(LTLIBRARIES) $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libdir)"; do \
|
||||
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -530,7 +586,7 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am:
|
||||
install-data-am: install-lintlibDATA
|
||||
|
||||
install-exec-am: install-libLTLIBRARIES
|
||||
|
||||
@ -558,7 +614,8 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
|
||||
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
|
||||
uninstall-lintlibDATA
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||
clean-libLTLIBRARIES clean-libtool ctags distclean \
|
||||
@ -566,13 +623,23 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-exec \
|
||||
install-exec-am install-info install-info-am \
|
||||
install-libLTLIBRARIES install-man install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-libLTLIBRARIES
|
||||
install-libLTLIBRARIES install-lintlibDATA install-man \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
uninstall-info-am uninstall-libLTLIBRARIES \
|
||||
uninstall-lintlibDATA
|
||||
|
||||
|
||||
@LINT_TRUE@lint:
|
||||
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) $(XEXT_LIBS)
|
||||
|
||||
@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libXmu_la_SOURCES)
|
||||
@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
|
||||
|
||||
@MAKE_LINT_LIB_TRUE@$(LINTLIBUU): $(libXmuu_la_SOURCES)
|
||||
@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES)
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -57,6 +57,9 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <X11/Xmu/Drawing.h>
|
||||
#ifdef WIN32
|
||||
#include <X11/Xwindows.h>
|
||||
#endif
|
||||
|
||||
#define MAX_SIZE 255
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid,
|
||||
vinfo_template.depth = depth;
|
||||
vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
|
||||
if ((vinfo = XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &n)) == NULL)
|
||||
return 0;
|
||||
return NULL;
|
||||
|
||||
/* Check the validity of the combination of visual characteristics,
|
||||
* allocation, and colormap property. Create an XStandardColormap
|
||||
@ -101,7 +101,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid,
|
||||
if (! valid_args(vinfo, red_max, green_max, blue_max, property)
|
||||
|| ((stdcmap = XAllocStandardColormap()) == NULL)) {
|
||||
XFree((char *) vinfo);
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Fill in the XStandardColormap structure */
|
||||
|
||||
@ -60,11 +60,14 @@ XmuCvtStringToWidget(XrmValuePtr args, Cardinal *num_args,
|
||||
{
|
||||
static Widget widget, *widgetP, parent;
|
||||
XrmName name = XrmStringToName(fromVal->addr);
|
||||
int i;
|
||||
Cardinal i;
|
||||
|
||||
if (*num_args != 1)
|
||||
{
|
||||
i = 0;
|
||||
XtErrorMsg("wrongParameters", "cvtStringToWidget", "xtToolkitError",
|
||||
"StringToWidget conversion needs parent arg", NULL, 0);
|
||||
"StringToWidget conversion needs parent arg", NULL, &i);
|
||||
}
|
||||
|
||||
parent = *(Widget*)args[0].addr;
|
||||
/* try to match names of normal children */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user