diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-09 11:38:25 +0300 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-09 11:38:25 +0300 |
| commit | a0eba77736ad3730052fd35c141ddc3ad507a823 (patch) | |
| tree | 4799a184f49ae141d0bdf2f144492ce6b6cac696 | |
| parent | 72b99e94b1ecb51a2182645797e6153baeb60fc4 (diff) | |
| parent | 2518a0dc871d877bf3269cda498ae1831ff22fb8 (diff) | |
| download | gnutls-a0eba77736ad3730052fd35c141ddc3ad507a823.tar.gz | |
Merge branch 'master' of ssh://nmav@git.sv.gnu.org/srv/git/gnutls
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | guile/modules/gnutls.scm | 3 | ||||
| -rw-r--r-- | guile/modules/gnutls/build/enums.scm | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -54,6 +54,10 @@ gnutls_oprfi_callback_func: ADD, new typedef function prototype. gnutls_oprfi_enable_client: ADD, new function. gnutls_oprfi_enable_server: ADD, new function. +* Version 2.0.2 (unreleased) + +** Fix configure-time Guile detection. + * Version 2.0.1 (released 2007-09-20) ** New directory doc/credentials/ with test credentials. diff --git a/configure.in b/configure.in index be6fed5377..86804b8499 100644 --- a/configure.in +++ b/configure.in @@ -312,14 +312,14 @@ if test "x$opt_guile_bindings" = "xyes"; then GUILE_FLAGS save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" CFLAGS="$CFLAGS $GUILE_CFLAGS" - LDFLAGS="$LDFLAGS $GUILE_LDFLAGS" + LIBS="$LIBS $GUILE_LDFLAGS" AC_MSG_CHECKING([whether GNU Guile is recent enough]) AC_LINK_IFELSE(AC_LANG_CALL([], [scm_from_locale_string]), [], [opt_guile_bindings=no]) CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" if test "x$opt_guile_bindings" = "xyes"; then AC_MSG_RESULT([yes]) diff --git a/guile/modules/gnutls.scm b/guile/modules/gnutls.scm index f98c4cf48a..423677dd08 100644 --- a/guile/modules/gnutls.scm +++ b/guile/modules/gnutls.scm @@ -190,8 +190,7 @@ alert-description/unsupported-extension alert-description/certificate-unobtainable alert-description/unrecognized-name - alert-description/unknown-srp-username - alert-description/missing-srp-username + alert-description/unknown-psk-identity alert-description/inner-application-failure alert-description/inner-application-verification handshake-description/hello-request diff --git a/guile/modules/gnutls/build/enums.scm b/guile/modules/gnutls/build/enums.scm index e09ef4f7c7..f16737f5e8 100644 --- a/guile/modules/gnutls/build/enums.scm +++ b/guile/modules/gnutls/build/enums.scm @@ -356,7 +356,7 @@ certificate-revoked certificate-expired certificate-unknown illegal-parameter unknown-ca access-denied decode-error decrypt-error export-restriction protocol-version insufficient-security internal-error user-canceled no-renegotiation unsupported-extension certificate-unobtainable -unrecognized-name unknown-srp-username missing-srp-username +unrecognized-name unknown-psk-identity inner-application-failure inner-application-verification) #f "GNUTLS_A_")) |