summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-07 17:58:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-07 17:58:03 +0000
commit68b71b4cb1271f593c4f1d3aa119ac27b4824024 (patch)
tree05bee1e574d8ca1d65fbd0fb3f3fdc9262d319ea
parent3d871596882e725bb55609b95c362b939be7819b (diff)
Re-enable bsdauth support. Reported and tested by ajacoutot@
-rw-r--r--app/xdm/Makefile.bsd-wrapper3
-rw-r--r--app/xdm/configure.ac10
2 files changed, 12 insertions, 1 deletions
diff --git a/app/xdm/Makefile.bsd-wrapper b/app/xdm/Makefile.bsd-wrapper
index dbcc601ef..f84f202e2 100644
--- a/app/xdm/Makefile.bsd-wrapper
+++ b/app/xdm/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2007/03/26 12:15:47 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2007/04/07 17:58:02 matthieu Exp $
PIXMAPDIR=/etc/X11/xdm/pixmaps
@@ -10,6 +10,7 @@ DEFAULT_VT= --with-default-vt=vt02
.endif
CONFIGURE_ARGS= --enable-privsep \
+ --enable-bsdauth \
$(DEFAULT_VT) \
--disable-dynamic-greeter \
--with-xdmlibdir=/etc/X11/xdm \
diff --git a/app/xdm/configure.ac b/app/xdm/configure.ac
index aed600202..f6cef32dd 100644
--- a/app/xdm/configure.ac
+++ b/app/xdm/configure.ac
@@ -193,6 +193,16 @@ if test x$ENABLE_PRIVSEP = xyes ; then
AC_DEFINE(X_PRIVSEP, 1, [Use X server privilege separation])
fi
+#
+# BSD auth
+AC_ARG_ENABLE(bsdauth,
+ AC_HELP_STRING([--enable-bsdauth],
+ [Build support for BSD authentification (default is NO)]),
+ [ENABLE_BSDAUTH="$enableval"], [ENABLE_BSDAUTH="no"])
+if test x$ENABLE_BSDAUTH = xyes ; then
+ AC_DEFINE(USE_BSDAUTH, 1, [Use BSD authentification])
+fi
+
# Figure out where everything goes in the filesystem
AC_ARG_WITH(xdmlibdir,