diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/include/do-not-use-config.h.in | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/include/do-not-use-config.h.in')
| -rw-r--r-- | xorg-server/include/do-not-use-config.h.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/xorg-server/include/do-not-use-config.h.in b/xorg-server/include/do-not-use-config.h.in index 19ca8a2a8..213f5d502 100644 --- a/xorg-server/include/do-not-use-config.h.in +++ b/xorg-server/include/do-not-use-config.h.in @@ -283,9 +283,21 @@ /* Define to 1 if you have the <selinux/selinux.h> header file. */ #undef HAVE_SELINUX_SELINUX_H -/* Use libmd SHA1 functions instead of OpenSSL libcrypto */ +/* Use CommonCrypto SHA1 functions */ +#undef HAVE_SHA1_IN_COMMONCRYPTO + +/* Use libc SHA1 functions */ +#undef HAVE_SHA1_IN_LIBC + +/* Use libgcrypt SHA1 functions */ +#undef HAVE_SHA1_IN_LIBGCRYPT + +/* Use libmd SHA1 functions */ #undef HAVE_SHA1_IN_LIBMD +/* Use libsha1 for SHA1 */ +#undef HAVE_SHA1_IN_LIBSHA1 + /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 @@ -384,9 +396,6 @@ /* Build Kdrive X server */ #undef KDRIVESERVER -/* Build VESA-based kdrive servers */ -#undef KDRIVEVESA - /* Prefix to use for launchd identifiers */ #undef LAUNCHD_ID_PREFIX @@ -525,6 +534,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Support PC98 */ +#undef SUPPORT_PC98 + /* Define to 1 on systems derived from System V Release 4 */ #undef SVR4 |