[src/trunk]: src/x11/bin/xdm Add -DARC4_RANDOM to the global CPPFLAGS and X11...

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

details:   https://anonhg.NetBSD.org/src/rev/3c9faeb462b4
branches:  trunk
changeset: 566142:3c9faeb462b4
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Apr 29 01:30:17 2004 +0000

description:
Add -DARC4_RANDOM to the global CPPFLAGS and X11EXTRAMANDEFS.
Remove -DDEV_RANDOM, since ARC4_RANDOM takes precedence anyway.

diffstat:

 x11/bin/xdm/Makefile     |  5 ++---
 x11/bin/xdm/Makefile.xdm |  7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r db17ad1434d5 -r 3c9faeb462b4 x11/bin/xdm/Makefile
--- a/x11/bin/xdm/Makefile      Thu Apr 29 00:48:04 2004 +0000
+++ b/x11/bin/xdm/Makefile      Thu Apr 29 01:30:17 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2004/04/16 12:58:06 rtr Exp $
+#      $NetBSD: Makefile,v 1.7 2004/04/29 01:30:17 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -9,8 +9,7 @@
                streams.c util.c xdmauth.c xdmcp.c \
                Login.c greet.c verify.c
 
-CPPFLAGS.auth.c=       -DBSD44SOCKETS -DHAS_MKSTEMP
-CPPFLAGS.genauth.c=    -DARC4_RANDOM
+CPPFLAGS.auth.c=       -DBSD44SOCKETS
 CPPFLAGS.socket.c=     -DBSD44SOCKETS
 CPPFLAGS.xdmcp.c=      -DBSD44SOCKETS
 CPPFLAGS.xdmshell.c=   -DHAS_VFORK
diff -r db17ad1434d5 -r 3c9faeb462b4 x11/bin/xdm/Makefile.xdm
--- a/x11/bin/xdm/Makefile.xdm  Thu Apr 29 00:48:04 2004 +0000
+++ b/x11/bin/xdm/Makefile.xdm  Thu Apr 29 01:30:17 2004 +0000
@@ -1,12 +1,15 @@
-#      $NetBSD: Makefile.xdm,v 1.3 2004/03/26 21:29:54 fredb Exp $
+#      $NetBSD: Makefile.xdm,v 1.4 2004/04/29 01:30:17 lukem Exp $
 
 CPPFLAGS+=     -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \
                -DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
-               -DFRAGILE_DEV_MEM -DDEV_RANDOM=\"/dev/urandom\" \
+               -DFRAGILE_DEV_MEM -DARC4_RANDOM \
                -DXPM -DUSE_XINERAMA -DHAS_SETPROCTITLE -UIPv6 \
+               -DHAS_MKSTEMP \
                -I${X11SRCDIR.xc}/programs/xdm \
                ${X11FLAGS.VERSION}
 
+X11EXTRAMANDEFS+=-DARC4_RANDOM
+
 CHOOSERPATH=   ${X11ROOTDIR}/libexec/chooser
 
 .PATH:         ${X11SRCDIR.xc}/programs/xdm