kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable smartcard and credssp feature by default and added

Browse Source 
--disable-<feature> for those to disable them.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1677 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2012-11-16 07:51:42 +00:00
parent 51014c91df
commit 387ec8a6c6
1 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure.ac
View File

@ -120,25 +120,26 @@ else
esac esac
fi fi
AC_ARG_ENABLE(credssp, dnl CredSSP feature
[ --enable-credssp enables CredSSP support (Kerberos only). AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
], [ AS_IF([test "x$enable_credssp" != "xno"], [
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
PKG_CHECK_MODULES(GSSGLUE, libgssglue, [ PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
fi
if test x"$WITH_CREDSSP" = "x1"; then
CREDSSPOBJ="cssp.o" CREDSSPOBJ="cssp.o"
CFLAGS="$CFLAGS $GSSGLUE_CFLAGS" CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
LIBS="$LIBS $GSSGLUE_LIBS" LIBS="$LIBS $GSSGLUE_LIBS"
AC_DEFINE(WITH_CREDSSP) AC_DEFINE(WITH_CREDSSP)
WITH_CREDSSP=1 else
], [ echo
AC_MSG_RESULT([Not found]) echo "CredSPP support requires libggsglue, install the dependency"
echo "or disable the feature using --disable-credssp."
echo echo
echo "ERROR: Could not find gssglue headers/libraries required for CredSSP."
exit 1 exit 1
])
fi fi
]) ])
AC_SUBST(CREDSSPOBJ) AC_SUBST(CREDSSPOBJ)
# xrandr # xrandr
@ -151,10 +152,9 @@ if test x"$HAVE_XRANDR" = "x1"; then
AC_DEFINE(HAVE_XRANDR) AC_DEFINE(HAVE_XRANDR)
fi fi
AC_ARG_ENABLE(smartcard, dnl Smartcard support
[ --enable-smartcard enables smart-card support. AC_ARG_ENABLE(smartcard, AS_HELP_STRING([--disable-smartcard], [disable support for smartcard]))
], AS_IF([test "x$enable_smartcard" != "xno"], [
[
case "$OSTYPE" in case "$OSTYPE" in
darwin*) darwin*)
AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0]) AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
@ -173,6 +173,12 @@ AC_ARG_ENABLE(smartcard,
CFLAGS="$CFLAGS $PCSCLITE_CFLAGS" CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
LIBS="$LIBS $PCSCLITE_LIBS" LIBS="$LIBS $PCSCLITE_LIBS"
AC_DEFINE(WITH_SCARD) AC_DEFINE(WITH_SCARD)
else
echo
echo "SmartCard support requires PCSC, install the dependency"
echo "or disable the feature using --disable-smartcard."
echo
exit 1
fi fi
AC_MSG_CHECKING([for old version of PCSC]) AC_MSG_CHECKING([for old version of PCSC])
@ -187,10 +193,8 @@ AC_ARG_ENABLE(smartcard,
], ],
[SCardControl(NULL, NULL, 0, NULL, NULL);], [SCardControl(NULL, NULL, 0, NULL, NULL);],
[AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])], [AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])],
[AC_MSG_RESULT(no)] [AC_MSG_RESULT(no)])
)
]) ])
AC_SUBST(SCARDOBJ) AC_SUBST(SCARDOBJ)
# #