Module Name: src
Committed By: christos
Date: Wed Mar 6 01:13:39 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/bin/xdm/chooser: Makefile
Log Message:
fix build
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdm/chooser/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.14 src/external/mit/xorg/bin/xdm/Makefile:1.15
--- src/external/mit/xorg/bin/xdm/Makefile:1.14 Tue Mar 5 03:35:35 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Mar 5 20:13:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/06 01:13:38 christos Exp $
.include <bsd.own.mk>
@@ -13,12 +13,12 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
-CPPFLAGS+= -DRETSIGTYPE=void
-CPPFLAGS.auth.c= -DBSD44SOCKETS
-CPPFLAGS.socket.c= -DBSD44SOCKETS
-CPPFLAGS.xdmcp.c= -DBSD44SOCKETS
-CPPFLAGS.xdmshell.c= -DHAS_VFORK
-CPPFLAGS.resource.c= \
+CPPFLAGS+= -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
+CPPFLAGS.auth.c+= -DBSD44SOCKETS
+CPPFLAGS.socket.c+= -DBSD44SOCKETS
+CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS
+CPPFLAGS.xdmshell.c+= -DHAS_VFORK
+CPPFLAGS.resource.c+= \
-DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
-DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
-DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
@@ -28,7 +28,7 @@ CPPFLAGS.resource.c= \
-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
-DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
-DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
- -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
+ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" \
LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3 Fri May 31 19:50:35 2013
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Tue Mar 5 20:13:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 23:50:35 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/06 01:13:39 christos Exp $
NOMAN= 1
@@ -6,7 +6,8 @@ NOMAN= 1
PROG= chooser
-CPPFLAGS.chooser.c= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
APPDEFS=Chooser
