diff options
| author | Tom Lane | 2005-03-25 00:34:31 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-03-25 00:34:31 +0000 |
| commit | e6befdc9d1666667835dc49d3b61bb526d74b69d (patch) | |
| tree | 6d08297f9e38a424e2cd7a387c46c8ee71038727 /configure.in | |
| parent | 46be09e91aa5a9e1be219f1a8b74621b16b9f2d6 (diff) | |
Kerberos fixes from Magnus Hagander --- in theory Kerberos 5 auth
should work on Windows now. Also, rename set_noblock to pg_set_noblock;
since it is included in libpq, the former name polluted application
namespace.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.in b/configure.in index ffc118ea8b7..d8da7cd4ffb 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.406 2005/03/11 17:20:33 momjian Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.407 2005/03/25 00:34:19 tgl Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -673,12 +673,17 @@ if test "$with_krb4" = yes ; then fi if test "$with_krb5" = yes ; then - AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [], - [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) - AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [], - [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])]) - AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [], - [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) + if test "$PORTNAME" != "win32"; then + AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [], + [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) + AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [], + [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])]) + AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [], + [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) + else + AC_SEARCH_LIBS(com_err, 'comerr32 -lkrb5_32', [], + [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) + fi fi if test "$with_openssl" = yes ; then |