Update to libXdmcp 1.0.3
This commit is contained in:
matthieu
parent
4fbf34305a
commit
659895ccf0
@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpARRAY8Equal (array1, array2)
|
||||
ARRAY8Ptr array1, array2;
|
||||
XdmcpARRAY8Equal (ARRAY8Ptr array1, ARRAY8Ptr array2)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -40,7 +40,20 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
void *
|
||||
/* this probably works for Mach-O too, but probably not for PE */
|
||||
#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3)
|
||||
#define weak __attribute__((weak))
|
||||
#else
|
||||
#define weak
|
||||
#endif
|
||||
|
||||
#ifdef __SUNPRO_C
|
||||
#pragma weak Xalloc
|
||||
#pragma weak Xrealloc
|
||||
#pragma weak Xfree
|
||||
#endif
|
||||
|
||||
weak void *
|
||||
Xalloc (unsigned long amount)
|
||||
{
|
||||
if (amount == 0)
|
||||
@ -48,7 +61,7 @@ Xalloc (unsigned long amount)
|
||||
return malloc (amount);
|
||||
}
|
||||
|
||||
void *
|
||||
weak void *
|
||||
Xrealloc (void *old, unsigned long amount)
|
||||
{
|
||||
if (amount == 0)
|
||||
@ -58,7 +71,7 @@ Xrealloc (void *old, unsigned long amount)
|
||||
return realloc ((char *) old, amount);
|
||||
}
|
||||
|
||||
void
|
||||
weak void
|
||||
Xfree (void *old)
|
||||
{
|
||||
if (old)
|
||||
|
||||
@ -37,8 +37,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xfuncs.h>
|
||||
|
||||
int
|
||||
XdmcpCopyARRAY8 (src, dst)
|
||||
ARRAY8Ptr src, dst;
|
||||
XdmcpCopyARRAY8 (ARRAY8Ptr src, ARRAY8Ptr dst)
|
||||
{
|
||||
dst->length = src->length;
|
||||
dst->data = (CARD8 *) Xalloc (dst->length * sizeof (CARD8));
|
||||
|
||||
@ -1,57 +1,402 @@
|
||||
2006-04-26 Adam Jackson <ajax@freedesktop.org>
|
||||
commit 3a7e0bb1cec5975e9fcbddc6569e7ac1aea550e5
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Aug 28 15:32:31 2009 +1000
|
||||
|
||||
* configure.ac:
|
||||
Bump to 1.0.1
|
||||
libXdmcp 1.0.3
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
2006-03-20 Adam Jackson <ajax@freedesktop.org>
|
||||
commit 8ba417e3f3915102f99e08b15e1543680120102d
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Sep 23 21:59:12 2009 +1000
|
||||
|
||||
* configure.ac:
|
||||
* Makefile.am:
|
||||
Bug #6243: Fix build on Cygwin, and when srcdir != objdir. (Yaakov
|
||||
Selkowitz)
|
||||
Require macros 1.3 for XORG_DEFAULT_OPTIONS.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
2006-01-12 Adam Jackson <ajax@freedesktop.org>
|
||||
commit d992d9dd3af95132ca76f0479d08d3479b899a95
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Feb 2 20:34:33 2009 -0800
|
||||
|
||||
* Wraphelp.c:
|
||||
static -> static const
|
||||
Add README with pointers to mailing list, bugzilla & git repos
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 49336f1b6fa5d8dc8a9ae3e8d286b061f0d2914c
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Fri Jan 9 16:34:13 2009 -0200
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
Ansification and compile warning fixes.
|
||||
|
||||
Code that already have a header with the proper prototype is safe
|
||||
to ansify.
|
||||
This uses XORG_CHANGELOG macro to properly work with the "git-log"
|
||||
to "git log" change (required to pass "make distcheck"), uses the
|
||||
XORG_CWARNFLAGS macro, and doesn't generate any compile warnings from
|
||||
gcc 4.3 and sparse.
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 498cce64f12de67271316417de821460e8eee066
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Wed Nov 26 23:45:09 2008 -0200
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Mark Xalloc, Xrealloc, and Xfree as weak symbols.
|
||||
|
||||
Maybe a _X_WEAK macro could be added to <X11/Xfuncproto.h>, but that
|
||||
could actually encourage use of __attribute__((weak)), what is not
|
||||
intended.
|
||||
This change uses the same semantics used in libXfont to declare
|
||||
weak symbols that are overridden by the ones defined in the X Server.
|
||||
|
||||
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit f876004608f8a4737f66e1fc0e83ff7e7d6d150b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Aug 11 14:43:15 2006 -0700
|
||||
|
||||
* xdmcp.pc.in:
|
||||
Update pkgconfig files to separate library build-time dependencies
|
||||
from application build-time dependencies.
|
||||
Version bump -> 1.0.2
|
||||
|
||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 55f64a8a29094905b9f49be95ee576de4a2e1a46
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Aug 11 14:41:42 2006 -0700
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for RC1 release.
|
||||
Require xorg-macros 1.1.0 or later for XORG_WITH_LINT & XORG_LINT_LIBRARY macros
|
||||
|
||||
2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit ae43ecfcb85ad238b2a513d3caf400028b951019
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Aug 11 14:26:26 2006 -0700
|
||||
|
||||
* Makefile.am:
|
||||
Add missing files to EXTRA_DIST
|
||||
Add lint library to CLEANFILES
|
||||
|
||||
2005-07-08 Keith Packard <keithp@keithp.com>
|
||||
commit a106f489a69246f24535acd8bdac96e273df7334
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Aug 11 14:22:42 2006 -0700
|
||||
|
||||
* .cvsignore:
|
||||
* Makefile.am:
|
||||
Add .cvsignore files
|
||||
Switch _la_CFLAGS for AM_CFLAGS to clean up directory
|
||||
|
||||
Tue May 17 10:38:30 2005 Søren Sandmann <sandmann@redhat.com>
|
||||
Replace static ChangeLog with dist-hook to generate from git-log
|
||||
|
||||
* configure.ac: Remove Xdmcpconf.h and references to it, since it
|
||||
is not needed.
|
||||
commit 644ff9232d48a32dcc16a1eeba2b51c8686eb33e
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Aug 10 15:58:18 2006 -0700
|
||||
|
||||
* ChangeLog: Delete entries from the xlibs tree since they are not
|
||||
relevant
|
||||
Use AC_CHECK_FUNCS instead of #ifdef SYSV to check for srand48 & lrand48
|
||||
|
||||
commit 048d2bb6b48dce7b2afea39cd429f3253d8e77ca
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Aug 10 15:43:31 2006 -0700
|
||||
|
||||
Add *~ to .gitignore to ignore emacs droppings
|
||||
|
||||
commit 1f3fadd3a0f8226fb19f94d6a6344e144e031bba
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jul 13 18:01:01 2006 -0700
|
||||
|
||||
Add lint checking & library targets
|
||||
|
||||
commit 0b7f0333fe6384598e78f6e0dc61dfbf3636c1c8
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jul 13 17:52:46 2006 -0700
|
||||
|
||||
Fix sparse warnings for using 0 instead of NULL
|
||||
|
||||
RA8.c:50:17: warning: Using plain integer as NULL pointer
|
||||
RA16.c:50:16: warning: Using plain integer as NULL pointer
|
||||
RA32.c:50:16: warning: Using plain integer as NULL pointer
|
||||
RAofA8.c:50:16: warning: Using plain integer as NULL pointer
|
||||
|
||||
commit bfcde07215512ea5153700bc57ef8baa8d3e9ef2
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jul 13 14:58:52 2006 -0700
|
||||
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
commit f204a3d32500eb8c6ec7a694a21440fc330ab834
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu Apr 27 00:07:09 2006 +0000
|
||||
|
||||
Bump to 1.0.1
|
||||
|
||||
commit b7de07f180407a1597ee74cc570311d7eb808637
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Mar 20 19:51:32 2006 +0000
|
||||
|
||||
Bug #6243: Fix build on Cygwin, and when srcdir != objdir. (Yaakov
|
||||
Selkowitz)
|
||||
|
||||
commit aaee3f658482018c622d8cbb926bbfa14df64eea
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu Jan 12 23:36:41 2006 +0000
|
||||
|
||||
static -> static const
|
||||
|
||||
commit 9f8e330eff571cc0c525fd42c4ef8a34cac2eb0d
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:29 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 9cd3a3746077c2d6a8fcf2c2c125237d9207e2fb
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:43 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit da0e8c8bbdfe6cef0225960b204eb9878897cb9b
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Nov 19 07:15:41 2005 +0000
|
||||
|
||||
Update pkgconfig files to separate library build-time dependencies from
|
||||
application build-time dependencies, and update package deps to work
|
||||
with separate build roots.
|
||||
|
||||
commit cbd6a80c320d7d02ca3bb6d1ca036c0eff27d2c3
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:09 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit 0609d6f55136698cb7120b62244d44423e6f0945
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 5 19:24:07 2005 +0000
|
||||
|
||||
Add missing files to EXTRA_DIST
|
||||
|
||||
commit b0c00126bad965f526ef13fa041248e8379a4a53
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sat Jul 30 07:44:09 2005 +0000
|
||||
|
||||
Add missing library dependencies: Xdmcp: -lsocket (if needed for recvfrom,
|
||||
such as on Solaris) lbxutil: -lz xkbui: -lm
|
||||
|
||||
commit 19ca07e4c538a6f8b46b3bbcdacd39afc1fdede0
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:51 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 7242946c1cac1ecb97ea0cc312a8ea08707ca945
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Sat Jul 16 06:41:57 2005 +0000
|
||||
|
||||
Use -version-number instead of -version-info.
|
||||
|
||||
commit ce57d6479026168ab4839dc8d93f8c13c7ee6356
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu Jul 14 15:12:44 2005 +0000
|
||||
|
||||
typo fixes (Matthieu Herrb)
|
||||
|
||||
commit d5c88f476d6d263b9e80640c1acd3ec784c7184b
|
||||
Author: Keith Packard <keithp@keithp.com>
|
||||
Date: Sat Jul 9 06:15:32 2005 +0000
|
||||
|
||||
Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
|
||||
|
||||
commit 1df326ab00b3ca1faf44d81ce53f6b66076ad0cf
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
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 77283d94174d18791e230b4800641242c1767e87
|
||||
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 daefb98f4437af90dcff3853ec23b8a1f0864018
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu May 19 00:10:07 2005 +0000
|
||||
|
||||
Require automake 1.7 in AM_INIT_AUTOMAKE
|
||||
|
||||
commit 2f31285482451b8ed44b0b61969a7f324dbe905a
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue May 17 14:43:47 2005 +0000
|
||||
|
||||
Tue May 17 10:38:30 2005 Søren Sandmann <sandmann@redhat.com>
|
||||
Remove Xdmcpconf.h and references to it, since it is not needed.
|
||||
Delete entries from the xlibs tree since they are not relevant
|
||||
|
||||
commit 83b3f8f9fcb08348d28dbdb19e07a2c41b9f8bf2
|
||||
Author: Josh Triplett <josh@speakeasy.net>
|
||||
Date: Sat May 14 08:03:04 2005 +0000
|
||||
|
||||
Add Xdmcpconf.h.in from xlibs tree.
|
||||
|
||||
commit ceec4744a2906539154007edf1ec3b865fef1991
|
||||
Author: Josh Triplett <josh@speakeasy.net>
|
||||
Date: Sat May 14 07:58:43 2005 +0000
|
||||
|
||||
Add configure.ac for Xdmcp from xlibs tree.
|
||||
|
||||
commit d5d1fb73e5c8c0b2a5b2704ec6b8394fc8a425b4
|
||||
Author: Josh Triplett <josh@speakeasy.net>
|
||||
Date: Sat May 14 07:46:48 2005 +0000
|
||||
|
||||
Move includes in Xau and Xdmcp into include/X11 subdirectories so that the
|
||||
source can reference them with <X11/...>.
|
||||
|
||||
commit 0ea8a9fde966a2fbdc075e4cfc47235d3c899022
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Thu May 12 16:27:25 2005 +0000
|
||||
|
||||
Thu May 12 12:24:16 2005 Søren Sandmann <sandmann@redhat.com>
|
||||
Conditionally include config.h
|
||||
add Makefile.am
|
||||
|
||||
commit 845dff36906d99a80ea920a8d0efb73bd0b88d56
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Thu May 12 16:12:34 2005 +0000
|
||||
|
||||
Make xtrans install in $(includedir)/X11/Xtrans. Remove all references to
|
||||
Xtransdef.
|
||||
Add Xdmcp build files
|
||||
Add Wrap.h to lib/dmcp part of symlink script.
|
||||
|
||||
commit 2e5c59efc9df61d84f81af0f9a100672d096bac6
|
||||
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
|
||||
Date: Mon Nov 15 15:06:55 2004 +0000
|
||||
|
||||
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
|
||||
mingw (Win32) port
|
||||
|
||||
commit 5cd56c90f05d05c19c484f606b70d17873b507b5
|
||||
Author: Keith Packard <keithp@keithp.com>
|
||||
Date: Tue Aug 24 18:33:32 2004 +0000
|
||||
|
||||
Replace 'uint32_t' with 'CARD32' and 'uint8_t' with 'CARD8'. Add #include
|
||||
<X11/Xmd.h>
|
||||
reviewed by: Stuart Kreitman <Stuart.Kreitman@Sun.COM>
|
||||
|
||||
commit 874e5e8b17f111f07c2c4e9167b4940365cc1421
|
||||
Author: Stuart Kreitman <stuart.kreitman@sun.com>
|
||||
Date: Mon Aug 23 17:06:37 2004 +0000
|
||||
|
||||
Modified Files: Wraphelp.c
|
||||
Coding standard recommended by C99 standards body:
|
||||
http://www.oreillynet.com/pub/a/network/2003/10/07/michael_barr.html
|
||||
|
||||
commit 7acd9ecff911e900deb03767f283d59fc90f550c
|
||||
Author: Jim Gettys <jg@freedesktop.org>
|
||||
Date: Sun Aug 22 01:02:25 2004 +0000
|
||||
|
||||
Matthieu Herrb <matthieu.herrb@laas.fr> points out:
|
||||
Hmm, this version doesn't work on LP64 big endian machines (like
|
||||
*BSD/sparc64). The problems were fixed in OpenBSD. May I suggest to switch
|
||||
to this version (it's the same origin, with the LP64 problems fixed):
|
||||
<http://www.openbsd.org/cgi-bin/cvsweb.cgi/XF4/xc/lib/Xdmcp/Wraphelp.c>
|
||||
|
||||
commit faf433b79417ef801ed3c62fdf9bbc8edf1b6ba3
|
||||
Author: Jim Gettys <jg@freedesktop.org>
|
||||
Date: Sat Aug 21 02:06:44 2004 +0000
|
||||
|
||||
Add Wraphelp.c to lib/Xdmcp, at long last, along with the U.S. government
|
||||
required notifications. The website notification went up first.
|
||||
Clean up Wraphelp.c so that it compiles cleanly.
|
||||
I chose the version Australian version written for R5 written by Eric
|
||||
Eay@psych.psy.uq.oz.au, as I don't know where the original one was, and
|
||||
didn't want to touch XFree86.
|
||||
Make HasXdmAuth YES for xorg.
|
||||
|
||||
commit 4a01be711a72d99e054a83e9a00a27b2fc420601
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sat Aug 7 19:22:01 2004 +0000
|
||||
|
||||
Check to see if array->data is NULL before we dereference it, instead of
|
||||
after. (Prevents segfault when array->data is initialized to NULL, but
|
||||
array->length is not set to 0.)
|
||||
Always initialize both data & length in ARRAYs.
|
||||
|
||||
commit 54c91c33da46e67a4efce0dd43def29c65677ed4
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Tue Jul 6 14:37:47 2004 +0000
|
||||
|
||||
Separated Intel drivers from default DriDrivers to avoid building them on
|
||||
IA64 (Egbert Eich).
|
||||
Fixed wrong function prototype (Egbert Eich).
|
||||
Don't test for generic VGA on IA64 (Egbert Eich).
|
||||
Fixed a segfault when accessing a structure before verifying the pointer
|
||||
exists (Egbert Eich).
|
||||
Added a showcache option for debugging (Egbert Eich).
|
||||
Increase default video RAM size to 16MB when DRI is enabled and more than
|
||||
128MB are available (Egbert Eich). Fixed lockups during mode switch.
|
||||
Problem was introduced when attempting to copy the behavior during
|
||||
LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before
|
||||
I810DRIEnter(). The entire DRILeave()/Enter() scenario has been
|
||||
commented out as it didn't seem to be necessary (Egbert Eich).
|
||||
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
|
||||
increased MAX_DEVICES to 128 (Egbert Eich).
|
||||
Use OS provided PCI config space access as default method (Egbert Eich).
|
||||
Added support for Linux 2.6 proc file format.
|
||||
Fixed unaligned accesses to pieces of the VBE info block. VESA did not
|
||||
align elements to size (Egbert Eich).
|
||||
|
||||
commit 11ce0b3adae5dac23d95fae62570d0a7e872055f
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 18:43:41 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit d1291a78bebace4d4ccef4b552bbfd145961ee44
|
||||
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 ca6d962126b1d876851293d9c0a407ff733b5558
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:11:28 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit 3132e3a51c671fc95ee2b88802ae30abcb177320
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:35:33 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit 47d1195510762af8efce38806dc75adc0bdc09cc
|
||||
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 8ecf5d371806b603b64f257e4caa1d9cbc19556d
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Dec 19 20:54:35 2003 +0000
|
||||
|
||||
XFree86 4.3.99.902 (RC 2)
|
||||
|
||||
commit 9cfba0fa56ff1ebae9aaccf1e63049759dbd37f5
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Thu Dec 4 22:02:56 2003 +0000
|
||||
|
||||
XFree86 4.3.99.901 (RC 1)
|
||||
|
||||
commit c95e0de1641abf24792dcafc5a98a95986183f53
|
||||
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 0200b5d9bb6a599aefbb05a2217e243ea0da387b
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:48 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit d1eb0ee78fbb0c109f9fa8e1bc05907608fc4299
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:38 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
void
|
||||
XdmcpDisposeARRAY32 (array)
|
||||
ARRAY32Ptr array;
|
||||
XdmcpDisposeARRAY32 (ARRAY32Ptr array)
|
||||
{
|
||||
if (array->data != NULL) Xfree (array->data);
|
||||
array->length = 0;
|
||||
|
||||
@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
void
|
||||
XdmcpDisposeARRAY8 (array)
|
||||
ARRAY8Ptr array;
|
||||
XdmcpDisposeARRAY8 (ARRAY8Ptr array)
|
||||
{
|
||||
if (array->data != NULL) Xfree (array->data);
|
||||
array->length = 0;
|
||||
|
||||
@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
void
|
||||
XdmcpDisposeARRAYofARRAY8 (array)
|
||||
ARRAYofARRAY8Ptr array;
|
||||
XdmcpDisposeARRAYofARRAY8 (ARRAYofARRAY8Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#endif
|
||||
|
||||
int
|
||||
XdmcpFill (fd, buffer, from, fromlen)
|
||||
int fd;
|
||||
XdmcpBufferPtr buffer;
|
||||
XdmcpNetaddr from; /* return */
|
||||
int *fromlen; /* return */
|
||||
XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)
|
||||
{
|
||||
BYTE *newBuf;
|
||||
#ifdef STREAMSCONN
|
||||
|
||||
@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#endif
|
||||
|
||||
int
|
||||
XdmcpFlush (fd, buffer, to, tolen)
|
||||
int fd;
|
||||
XdmcpBufferPtr buffer;
|
||||
XdmcpNetaddr to;
|
||||
int tolen;
|
||||
XdmcpFlush (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen)
|
||||
{
|
||||
int result;
|
||||
#ifdef STREAMSCONN
|
||||
|
||||
@ -50,7 +50,7 @@ getbits (long data, unsigned char *dst)
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#if defined(SYSV) || defined(SVR4)
|
||||
#if defined(HAVE_LRAND48) && defined(HAVE_SRAND48)
|
||||
#define srandom srand48
|
||||
#define random lrand48
|
||||
#endif
|
||||
|
||||
@ -62,3 +62,31 @@ pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xdmcp.pc
|
||||
|
||||
EXTRA_DIST = xdmcp.pc.in autogen.sh Wraphelp.c Wraphelp.README.crypto
|
||||
|
||||
if LINT
|
||||
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
|
||||
|
||||
lint:
|
||||
$(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)
|
||||
endif LINT
|
||||
|
||||
if MAKE_LINT_LIB
|
||||
lintlibdir = $(libdir)
|
||||
|
||||
lintlib_DATA = $(LINTLIB)
|
||||
|
||||
$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
|
||||
$(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
|
||||
endif MAKE_LINT_LIB
|
||||
|
||||
MAINTAINERCLEANFILES=ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
CLEANFILES=$(lintlib_DATA)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 12:07:34 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2009/10/31 17:53:31 matthieu Exp $
|
||||
|
||||
SHARED_LIBS= Xdmcp 9.0
|
||||
SHARED_LIBS= Xdmcp 10.0
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
|
||||
@ -59,8 +59,8 @@ am__vpath_adj = case $$p in \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
|
||||
"$(DESTDIR)$(xdmcpincludedir)"
|
||||
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" \
|
||||
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdmcpincludedir)"
|
||||
libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
@ -87,8 +87,9 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
|
||||
DIST_SOURCES = $(libXdmcp_la_SOURCES)
|
||||
lintlibDATA_INSTALL = $(INSTALL_DATA)
|
||||
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
DATA = $(lintlib_DATA) $(pkgconfig_DATA)
|
||||
xdmcpincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
||||
HEADERS = $(xdmcpinclude_HEADERS)
|
||||
ETAGS = etags
|
||||
@ -103,11 +104,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@
|
||||
AS = @AS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
@ -117,8 +121,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@
|
||||
@ -127,6 +133,9 @@ CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
@ -135,6 +144,9 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HASXDMAUTH_FALSE = @HASXDMAUTH_FALSE@
|
||||
HASXDMAUTH_TRUE = @HASXDMAUTH_TRUE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@ -145,12 +157,24 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINT = @LINT@
|
||||
LINTLIB = @LINTLIB@
|
||||
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@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -162,22 +186,16 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XDMCP_CFLAGS = @XDMCP_CFLAGS@
|
||||
XDMCP_LIBS = @XDMCP_LIBS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_AS = @ac_ct_AS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
|
||||
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@
|
||||
@ -194,23 +212,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@
|
||||
@ -273,6 +299,13 @@ xdmcpinclude_HEADERS = \
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xdmcp.pc
|
||||
EXTRA_DIST = xdmcp.pc.in autogen.sh Wraphelp.c Wraphelp.README.crypto
|
||||
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
|
||||
|
||||
@MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir)
|
||||
@MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB)
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
CLEANFILES = $(lintlib_DATA)
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
@ -438,6 +471,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
|
||||
install-pkgconfigDATA: $(pkgconfig_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
|
||||
@ -551,6 +601,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 \
|
||||
@ -652,7 +705,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdmcpincludedir)"; do \
|
||||
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdmcpincludedir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -672,6 +725,7 @@ install-strip:
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||
@ -679,6 +733,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-am
|
||||
|
||||
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
|
||||
@ -701,7 +756,8 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-pkgconfigDATA install-xdmcpincludeHEADERS
|
||||
install-data-am: install-lintlibDATA install-pkgconfigDATA \
|
||||
install-xdmcpincludeHEADERS
|
||||
|
||||
install-exec-am: install-libLTLIBRARIES
|
||||
|
||||
@ -732,25 +788,40 @@ ps: ps-am
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
|
||||
uninstall-pkgconfigDATA uninstall-xdmcpincludeHEADERS
|
||||
uninstall-lintlibDATA uninstall-pkgconfigDATA \
|
||||
uninstall-xdmcpincludeHEADERS
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||
clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
|
||||
dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
|
||||
distcheck distclean distclean-compile distclean-generic \
|
||||
distclean-hdr distclean-libtool distclean-tags distcleancheck \
|
||||
distdir distuninstallcheck dvi dvi-am html html-am info \
|
||||
info-am install install-am install-data install-data-am \
|
||||
install-exec install-exec-am install-info install-info-am \
|
||||
install-libLTLIBRARIES install-man install-pkgconfigDATA \
|
||||
dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
|
||||
dist-zip distcheck distclean distclean-compile \
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-exec install-exec-am \
|
||||
install-info install-info-am install-libLTLIBRARIES \
|
||||
install-lintlibDATA install-man install-pkgconfigDATA \
|
||||
install-strip install-xdmcpincludeHEADERS 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-pkgconfigDATA \
|
||||
uninstall-xdmcpincludeHEADERS
|
||||
uninstall-libLTLIBRARIES uninstall-lintlibDATA \
|
||||
uninstall-pkgconfigDATA uninstall-xdmcpincludeHEADERS
|
||||
|
||||
|
||||
@LINT_TRUE@lint:
|
||||
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)
|
||||
|
||||
@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
|
||||
@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# 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:
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadARRAY16 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY16Ptr array;
|
||||
XdmcpReadARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -47,7 +45,7 @@ XdmcpReadARRAY16 (buffer, array)
|
||||
/* Must set array->data to NULL to guarantee safe call of
|
||||
* XdmcpDisposeARRAY*(array) (which calls Xfree(array->data));
|
||||
* see defect 7329 */
|
||||
array->data = 0;
|
||||
array->data = NULL;
|
||||
return FALSE;
|
||||
}
|
||||
if (!array->length)
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadARRAY32 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY32Ptr array;
|
||||
XdmcpReadARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -47,7 +45,7 @@ XdmcpReadARRAY32 (buffer, array)
|
||||
/* Must set array->data to NULL to guarantee safe call of
|
||||
* XdmcpDisposeARRAY*(array) (which calls Xfree(array->data));
|
||||
* see defect 7329 */
|
||||
array->data = 0;
|
||||
array->data = NULL;
|
||||
return FALSE;
|
||||
}
|
||||
if (!array->length)
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadARRAY8 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY8Ptr array;
|
||||
XdmcpReadARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -47,7 +45,7 @@ XdmcpReadARRAY8 (buffer, array)
|
||||
/* Must set array->data to NULL to guarantee safe call of
|
||||
* XdmcpDisposeARRAY*(array) (which calls Xfree(array->data));
|
||||
* see defect 7329 */
|
||||
array->data = 0;
|
||||
array->data = NULL;
|
||||
return FALSE;
|
||||
}
|
||||
if (!array->length)
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadARRAYofARRAY8 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAYofARRAY8Ptr array;
|
||||
XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -47,7 +45,7 @@ XdmcpReadARRAYofARRAY8 (buffer, array)
|
||||
/* Must set array->data to NULL to guarantee safe call of
|
||||
* XdmcpDisposeARRAY*(array) (which calls Xfree(array->data));
|
||||
* see defect 7329 */
|
||||
array->data = 0;
|
||||
array->data = NULL;
|
||||
return FALSE;
|
||||
}
|
||||
if (!array->length)
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadCARD16 (buffer, valuep)
|
||||
XdmcpBufferPtr buffer;
|
||||
CARD16Ptr valuep;
|
||||
XdmcpReadCARD16 (XdmcpBufferPtr buffer, CARD16Ptr valuep)
|
||||
{
|
||||
CARD8 high, low;
|
||||
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadCARD32 (buffer, valuep)
|
||||
XdmcpBufferPtr buffer;
|
||||
CARD32Ptr valuep;
|
||||
XdmcpReadCARD32 (XdmcpBufferPtr buffer, CARD32Ptr valuep)
|
||||
{
|
||||
CARD8 byte0, byte1, byte2, byte3;
|
||||
if (XdmcpReadCARD8 (buffer, &byte0) &&
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadCARD8 (buffer, valuep)
|
||||
XdmcpBufferPtr buffer;
|
||||
CARD8Ptr valuep;
|
||||
XdmcpReadCARD8 (XdmcpBufferPtr buffer, CARD8Ptr valuep)
|
||||
{
|
||||
if (buffer->pointer >= buffer->count)
|
||||
return FALSE;
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
libXdmcp - X Display Manager Control Protocol 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/libXdmcp
|
||||
|
||||
http://cgit.freedesktop.org/xorg/lib/libXdmcp
|
||||
|
||||
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
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadHeader (buffer, header)
|
||||
XdmcpBufferPtr buffer;
|
||||
XdmcpHeaderPtr header;
|
||||
XdmcpReadHeader (XdmcpBufferPtr buffer, XdmcpHeaderPtr header)
|
||||
{
|
||||
if (XdmcpReadCARD16 (buffer, &header->version) &&
|
||||
XdmcpReadCARD16 (buffer, &header->opcode) &&
|
||||
|
||||
@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpReadRemaining (buffer)
|
||||
XdmcpBufferPtr buffer;
|
||||
XdmcpReadRemaining (XdmcpBufferPtr buffer)
|
||||
{
|
||||
return buffer->count - buffer->pointer;
|
||||
}
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpWriteARRAY16 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY16Ptr array;
|
||||
XdmcpWriteARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpWriteARRAY32 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY32Ptr array;
|
||||
XdmcpWriteARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpWriteARRAY8 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAY8Ptr array;
|
||||
XdmcpWriteARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xdmcp.h>
|
||||
|
||||
int
|
||||
XdmcpWriteARRAYofARRAY8 (buffer, array)
|
||||
XdmcpBufferPtr buffer;
|
||||
ARRAYofARRAY8Ptr array;
|
||||
XdmcpWriteARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $XdotOrg: lib/Xdmcp/Wrap.h,v 1.6 2005/07/03 07:00:56 daniels Exp $ */
|
||||
/* $XdotOrg: xc/lib/Xdmcp/Wrap.h,v 1.5 2004/08/22 01:02:25 jg Exp $ */
|
||||
/* $Xorg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */
|
||||
/*
|
||||
* header file for compatibility with something useful
|
||||
|
||||
1239
lib/libXdmcp/aclocal.m4
vendored
1239
lib/libXdmcp/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -9,9 +9,15 @@
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the `lrand48' function. */
|
||||
#undef HAVE_LRAND48
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the `srand48' function. */
|
||||
#undef HAVE_SRAND48
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
|
||||
10775
lib/libXdmcp/configure
vendored
10775
lib/libXdmcp/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,4 @@
|
||||
dnl
|
||||
dnl $Id: configure.ac,v 1.1.1.1 2006/11/25 17:02:37 matthieu Exp $
|
||||
dnl
|
||||
dnl Copyright © 2003 Keith Packard, Noah Levitt
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -24,12 +22,16 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(libXdmcp, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp)
|
||||
AC_INIT(libXdmcp, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
@ -37,9 +39,13 @@ AC_LIBTOOL_WIN32_DLL
|
||||
AM_PROG_LIBTOOL
|
||||
AC_PROG_MAKE_SET
|
||||
|
||||
AC_CHECK_FUNCS([srand48 lrand48])
|
||||
|
||||
AC_SEARCH_LIBS([recvfrom],[socket])
|
||||
|
||||
PKG_CHECK_MODULES(XDMCP, xproto)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS"
|
||||
AC_SUBST(XDMCP_CFLAGS)
|
||||
AC_SUBST(XDMCP_LIBS)
|
||||
|
||||
@ -52,7 +58,9 @@ fi
|
||||
|
||||
AM_CONDITIONAL(HASXDMAUTH,test x$HASXDMAUTH = xyes)
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
dnl Allow checking code with lint, sparse, etc.
|
||||
XORG_WITH_LINT
|
||||
XORG_LINT_LIBRARY([Xdmcp])
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
xdmcp.pc])
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $XdotOrg: lib/Xdmcp/include/X11/Xdmcp.h,v 1.3 2005/07/03 07:00:56 daniels Exp $ */
|
||||
/* $XdotOrg: xc/lib/Xdmcp/Xdmcp.h,v 1.2 2004/04/23 18:43:41 eich Exp $ */
|
||||
/* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
|
||||
/*
|
||||
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user