Attachment 762 Details for Bug 1203 – remove Wrap.c, Wrap.h and WrapHelp.c from libX11

[patch] remove Wrap.c, Wrap.h and WrapHelp.c from libX11

x11-xdmcp.diff (text/plain), 1.21 KB, created by Alexander Gottwald on 2004-08-29 08:16:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-08-29 08:16:45 UTC

Size: 1.21 KB

patch

obsolete

>Index: Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/X11/Imakefile,v
>retrieving revision 1.6
>diff -u -r1.6 Imakefile
>--- Imakefile	27 Aug 2004 22:47:45 -0000	1.6
>+++ Imakefile	29 Aug 2004 15:11:34 -0000
>@@ -50,7 +50,7 @@
> REQUIREDI18NLIBS = DlLibrary
> #endif
> 
>-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS)
>+REQUIREDLIBS=$(XDMAUTHLIBS) $(REQUIREDX11LIBS) $(REQUIREDI18NLIBS)
> 
> #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
> XBSDLIB = /**/
>@@ -63,9 +63,13 @@
> #endif
> #if HasXdmAuth
>         XDMAUTHDEFS = -DHASXDMAUTH
>+#ifdef cygwinArchitecture
>+        XDMAUTHLIBS = -L$(BUILDLIBDIR) -lXdmcp
>+#else
>         XDMAUTHOBJS = Wrap.o Wraphelp.o
>         XDMAUTHSRCS = Wrap.c Wraphelp.c
> #endif
>+#endif
> #if BuildXKBlib
>     XKB_DEFINES = -DXKB 
>         XKBSRCS = XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
>@@ -1060,10 +1064,12 @@
> LinkSourceFile(k5encode.c,$(XAUTHSRC))
> #endif
> #if HasXdmAuth
>+#ifndef cygwinArchitecture
> LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
> LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
> LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
> #endif
>+#endif
> 
> #ifdef QNX4Architecture
> LOCAL_LDFLAGS=-F

Actions: View | Splinter Review

Attachments on bug 1203: 762 | 776 | 777

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.