diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-06-15 14:24:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-06-15 14:24:59 -0700 |
| commit | 0ce4128e19f9fac9a565cce42a6a575486d371a5 (patch) | |
| tree | b87f304d05b651b1a9c3201653d9a40abc8d18c7 | |
| parent | 8e0b23e24556fb6c6b9943bf3747e70b245fc7aa (diff) | |
Add --enable-xdm-auth/--disable-xdm-auth to configure options
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1a7bc1f..8a4911e 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ if test "x$USE_PAM" != "xno" ; then AC_CHECK_FUNC(pam_open_session, [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])], [if test "x$USE_PAM" != "xtry" ; then - AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) + AC_MSG_ERROR([PAM support requested, but pam_open_session not found.]) fi]) fi @@ -155,7 +155,7 @@ if test x$RANDOM_DEVICE = xyes -o x$RANDOM_DEVICE = xtry ; then AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom], AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random])) if test x$RANDOM_DEVICE = xyes ; then - AC_MSG_ERROR(["random device support requested, but no random device was found."]) + AC_MSG_ERROR([random device support requested, but no random device was found.]) else if test x$RANDOM_DEVICE = xtry ; then RANDOM_DEVICE="no" @@ -370,9 +370,18 @@ XDM_CFLAGS="$XDM_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $OS_CFLAGS $AUTH_CFLAGS" XDM_LIBS="$XDM_LIBS $DMCP_LIBS" AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$DMCP_LIBS]) -AC_SEARCH_LIBS(crypt, crypt) -AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes) +AC_ARG_ENABLE(xdm-auth, + AC_HELP_STRING([--enable-xdm-auth], + [Support XDM-AUTHENTICATION-1 and XDM-AUTHORIZATION-1 (default: auto)]), + [xdmauth_enable="$enableval"], [xdmauth_enable="auto"]) +if test "x$xdmauth_enable" = "xyes" -a "x$xdmauth" = "xno" ; then + AC_MSG_ERROR([XDM-AUTH support requested, but XdmcpWrap not found in libXdmcp.]) +fi + +AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno) + +AC_SEARCH_LIBS(crypt, crypt) AC_SUBST(XDM_CFLAGS) AC_SUBST(XDM_LIBS) |