*** empty log message ***

3 files changed, 23 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index 8f3d70d8a4..5f7fb0b0a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Version 0.9.8
 - Updated the SRP implementation to follow the latest draft.
 - Improved the gnutls-cli behaviour in error handling.
+- Use versioned symbols in the library (where available).
 
 Version 0.9.7 (25/08/2003)
 - The tex files are now included in the distribution.
diff --git a/configure.in b/configure.in
index 57a7673820..d6380848cc 100644
--- a/configure.in
+++ b/configure.in
@@ -148,18 +148,6 @@ if test $ac_cv_c_compiler_gnu != no; then
 	fi
 fi
 
-AC_MSG_CHECKING([whether we have GNU ld or compatible])
-
-GLD=`ld --help < /dev/null 2>/dev/null | grep version-script`
-if test "$GLD"; then
-have_ld_version_script=yes
-  AC_MSG_RESULT(yes)
-else
-have_ld_version_script=no
-  AC_MSG_RESULT(no)
-fi
-
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 AC_MSG_RESULT([***
 *** Detecting C library capabilities...
@@ -399,6 +387,25 @@ AC_MSG_RESULT([***
 ])
 AM_PROG_LIBTOOL
 
+dnl This is after AM_PROG_LIBTOOL so that the LD variable
+dnl has been set.
+
+AC_MSG_CHECKING([whether we have GNU ld or compatible])
+
+GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+if test "$GLD"; then
+have_ld_version_script=yes
+  AC_MSG_RESULT(yes)
+else
+have_ld_version_script=no
+  AC_MSG_RESULT(no)
+AC_MSG_WARN(***
+*** You may want to rerun configure using --with-gnu-ld to enable versioned symbols.
+)
+fi
+
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
+
 
 LIBGNUTLS_LIBS="$LIBS -L${libdir} -lgnutls $LIBASN1_LINK $LIBGCRYPT_LIBS"
 LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
diff --git a/src/cli.c b/src/cli.c
index 686d29bbd7..e850028e27 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -291,7 +291,7 @@ int main(int argc, char **argv)
 
       ret = do_handshake(&hd);
 
-      if (ret < 0 && handle_error(hd, ret) < 0) {
+      if (handle_error(hd, ret) < 0) {
 	 fprintf(stderr, "*** Handshake has failed\n");
 	 gnutls_perror(ret);
 	 gnutls_deinit(hd.session);
@@ -359,7 +359,7 @@ int main(int argc, char **argv)
 	 if (ret == 0) {
 	    printf("- Peer has closed the GNUTLS connection\n");
 	    break;
-	 } else if (ret < 0 && user_term == 0 && handle_error(hd, ret) < 0) {
+	 } else if (handle_error(hd, ret) < 0 && user_term == 0) {
 	    fprintf(stderr,
 		    "*** Server has terminated the connection abnormally.\n");
 	    break;
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
   	    if (hd.secure == 0) {
   	       fprintf(stderr, "*** Starting TLS handshake\n");
 	       ret = do_handshake(&hd);
-	       if (ret < 0 && handle_error(hd, ret) < 0) {
+	       if (handle_error(hd, ret) < 0) {
  		 fprintf(stderr, "*** Handshake has failed\n");
 		 socket_bye(&hd);
 		 user_term = 1;