[src/trunk]: src/x11/Xserver/os Define XDMCP_NO_IPV6 along with XDMCP, as per...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b98e5a93ac0
branches:  trunk
changeset: 566146:3b98e5a93ac0
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Apr 29 02:14:52 2004 +0000

description:
Define XDMCP_NO_IPV6 along with XDMCP, as per the "native" XFree86 4.4 build.

diffstat:

 x11/Xserver/os/Makefile |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 58e4bb8b5984 -r 3b98e5a93ac0 x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Thu Apr 29 02:12:30 2004 +0000
+++ b/x11/Xserver/os/Makefile   Thu Apr 29 02:14:52 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2004/04/05 12:03:25 lukem Exp $
+#      $NetBSD: Makefile,v 1.12 2004/04/29 02:14:52 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -38,19 +38,21 @@
 SRCS+= GetTimeInMillis.c
 .endif
 
+XDMCP_DEFINES=         -DXDMCP -DXDMCP_NO_IPV6
+
 CPPFLAGS.WaitFor.c=    ${X11FLAGS.EXTENSION}
-CPPFLAGS.access.c=     -DXDMCP -DBSD44SOCKETS -DHAS_GETIFADDRS
-CPPFLAGS.auth.c=       -DXDMCP -DHAVE_ARC4RANDOM
-CPPFLAGS.connection.c= -DXDMCP -DBSD44SOCKETS
+CPPFLAGS.access.c=     ${XDMCP_DEFINES} -DBSD44SOCKETS -DHAS_GETIFADDRS
+CPPFLAGS.auth.c=       ${XDMCP_DEFINES} -DHAVE_ARC4RANDOM
+CPPFLAGS.connection.c= ${XDMCP_DEFINES} -DBSD44SOCKETS
 CPPFLAGS.io.c=         ${X11FLAGS.EXTENSION}
 CPPFLAGS.lbxio.c=      ${X11FLAGS.EXTENSION}
 CPPFLAGS.oscolor.c=    -DNDBM
 CPPFLAGS.osinit.c=     -DADMPATH=\"/var/log/X\%smsgs\"
 CPPFLAGS.transport.c=  -DBSD44SOCKETS -I${X11SRCDIR.xc}/lib/xtrans
-CPPFLAGS.utils.c=      -DXDMCP ${X11FLAGS.EXTENSION}
-CPPFLAGS.xdmauth.c=    -DXDMCP
+CPPFLAGS.utils.c=      ${XDMCP_DEFINES} ${X11FLAGS.EXTENSION}
+CPPFLAGS.xdmauth.c=    ${XDMCP_DEFINES}
 COPTS.xdmauth.c=       -Wno-error      # XXX
-CPPFLAGS.xdmcp.c=      -DXDMCP -DBSD44SOCKETS
+CPPFLAGS.xdmcp.c=      ${XDMCP_DEFINES} -DBSD44SOCKETS
 
 BUILDOBJS=             libc_wrapper.o
 .PATH:                 ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared