diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-09 15:52:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-09 15:52:33 +0200 |
| commit | 8a448108ec0bc3a0a488b2234e0d12aee503c67c (patch) | |
| tree | 22e71069622608062b2f5eab3ef485438cd32122 /xorg-server/configure.ac | |
| parent | 62068b3bc534d504e40df34847b4436f1a496f35 (diff) | |
| download | vcxsrv-8a448108ec0bc3a0a488b2234e0d12aee503c67c.tar.gz vcxsrv-8a448108ec0bc3a0a488b2234e0d12aee503c67c.tar.bz2 vcxsrv-8a448108ec0bc3a0a488b2234e0d12aee503c67c.zip | |
libX11 mesa xserver xkeyboard-config
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 6a41ea83f..97ceab1b8 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -1355,7 +1355,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' # SHA1 hashing AC_ARG_WITH([sha1], - [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto], + [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI], [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then @@ -1381,6 +1381,19 @@ if test "x$with_sha1" = xCommonCrypto; then [Use CommonCrypto SHA1 functions]) SHA1_LIBS="" fi +dnl stdcall functions cannot be tested with AC_CHECK_LIB +AC_CHECK_HEADER([wincrypt.h], [HAVE_SHA1_IN_CRYPTOAPI=yes], [], [#include <windows.h>]) +if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_CRYPTOAPI" = xyes; then + with_sha1=CryptoAPI +fi +if test "x$with_sha1" = xCryptoAPI && test "x$HAVE_SHA1_IN_CRYPTOAPI" != xyes; then + AC_MSG_ERROR([CryptoAPI requested but not found]) +fi +if test "x$with_sha1" = xCryptoAPI; then + AC_DEFINE([HAVE_SHA1_IN_CRYPTOAPI], [1], + [Use CryptoAPI SHA1 functions]) + SHA1_LIBS="" +fi AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes]) if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then with_sha1=libmd |