067_fix_X11_and_xdm_build_problems.diff removes line
SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
from lib/X11/Imakefile and that breaks libX11 build leaving it with
undefined symbol XdmcpWrap.
Fixed version attached.
$Id: 067_fix_X11_and_xdm_build_problems.diff 1044 2004-02-16 17:40:33Z branden $
This patch by Branden Robinson. Prompted by recent mysterious breakage
with XDM auth support. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing
targets to the Makefile to create the symlink from the Xdmcp directory but
neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h
target never got invoked.
xc/programs/xdm/Imakefile has exactly the same problem with exactly the
same file, plus the same problem with the greeter's header files.
Index: xc/lib/X11/Imakefile
===================================================================
--- xc.orig/lib/X11/Imakefile 2005-07-07 00:29:31.000000000 +0800
+++ xc/lib/X11/Imakefile 2005-07-07 00:29:32.000000000 +0800
@@ -13,8 +13,6 @@
#if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary &&
!BuildClients && !XdmxServer
all::
-depend::
-
BuildIncludes($(HEADERS),IncSubdir,..)
#else
@@ -67,7 +65,7 @@
MALLOC_DEFINES = XMalloc0ReturnsNullDefines
#endif
#if HasXdmAuth
- XDMAUTHDEFS = -DHASXDMAUTH
+ XDMAUTHDEFS = -I$(XDMCPLIBSRC) -DHASXDMAUTH
XDMAUTHOBJS = Wrap.o Wraphelp.o
XDMAUTHSRCS = Wrap.c Wraphelp.c
#endif
@@ -1018,6 +1016,7 @@
LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES)
$(XTRANS_X_DEFINES) $(XKB_DEFINES))
SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
+SpecialCLibObjectRule(Wraphelp,$(ICONFIGFILES),$(XDMAUTHDEFS))
SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES)
$(XTRANS_X_DEFINES))
SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES)
$(XF86BIGFONT_DEFINES))
SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES)
$(XF86BIGFONT_DEFINES))
@@ -1065,7 +1064,6 @@
LinkSourceFile(k5encode.c,$(XAUTHSRC))
#endif
#if HasXdmAuth
-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
#endif
Index: xc/programs/xdm/Imakefile
===================================================================
--- xc.orig/programs/xdm/Imakefile 2005-07-07 00:26:37.000000000 +0800
+++ xc/programs/xdm/Imakefile 2005-07-07 00:29:32.000000000 +0800
@@ -26,7 +26,7 @@
#endif
#if HasXdmAuth
-XDMAUTH_DEFINES = -DHASXDMAUTH
+XDMAUTH_DEFINES = -I$(XDMCPLIBSRC) -DHASXDMAUTH
XDMAUTHOBJS = xdmauth.o
XDMAUTHSRCS = xdmauth.c
#endif
@@ -337,6 +337,7 @@
LinkSourceFile(Login.c,greeter)
LinkSourceFile(Login.h,greeter)
LinkSourceFile(LoginP.h,greeter)
+SpecialCObjectRule(greet,Login.h LoginP.h,-I.)
#if BuildBoth
ObjectFromSpecialSource(greetsh,greet,-DUSESHADOW)
ObjectFromSpecialSource(verifysh,verify,-DUSESHADOW)
