Index: configure.in
===================================================================
RCS file: /cvsroot/libssh2/libssh2/configure.in,v
retrieving revision 1.41
diff -u -r1.41 configure.in
--- configure.in        7 Feb 2007 21:39:17 -0000       1.41
+++ configure.in        25 Mar 2007 16:46:14 -0000
@@ -55,6 +55,10 @@
 fi
 AM_CONDITIONAL(LIBGCRYPT, test "$use_libgcrypt" != "no")
 
+# Need to define SHLIB_SUFFIX_NAME before checking for libcrypt and libz
+# $shrext_cmds (from libtool) can contain commands so it must be eval'd
+eval SHLIB_SUFFIX_NAME=\"$shrext_cmds\"
+
 #
 # Look for OpenSSL
 #
@@ -107,7 +111,7 @@
       OPENSSL_INCLINE="-I$i/include"
       OPENSSL_INCDIR=$i/include
     fi
-    if test -r $i/lib/libcrypto.a -o -r $i/lib/libcrypto.$SHLIB_SUFFIX_NAME; then
+    if test -r $i/lib/libcrypto.a -o -r $i/lib/libcrypto$SHLIB_SUFFIX_NAME; then
       OPENSSL_LIBLINE="-L$i/lib -lcrypto"
     fi
     test -n "$OPENSSL_INCLINE" && test -n "$OPENSSL_LIBLINE" && break
@@ -160,7 +164,7 @@
   if test -r $i/include/zlib.h; then
     LIBZ_INCDIR=$i/include
   fi
-  if test -r $i/lib/libz.a -o -r $i/lib/libz.$SHLIB_SUFFIX_NAME; then
+  if test -r $i/lib/libz.a -o -r $i/lib/libz$SHLIB_SUFFIX_NAME; then
     LIBZ_LIBDIR=$i/lib
   fi
   test -n "$LIBZ_INCDIR" && test -n "$LIBZ_LIBDIR" && break
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/libssh2/libssh2/tests/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/Makefile.am   14 Mar 2007 21:59:12 -0000      1.2
+++ tests/Makefile.am   25 Mar 2007 16:46:15 -0000
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_LDFLAGS = -no-install
 LDADD = ../src/libssh2.la
 
 ctests = simple