File php5-ssh2-lib64.patch of Package php5-ssh2

File php5-ssh2-lib64.patch of Package php5-ssh2 (Revision 2)

Currently displaying revision 2, show latest

Index: config.m4
===================================================================
RCS file: /repository/pecl/ssh2/config.m4,v
retrieving revision 1.7
diff -u -r1.7 config.m4
--- config.m4	21 Jul 2005 20:38:21 -0000	1.7
+++ config.m4	22 Dec 2006 06:54:25 -0000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.7 2005/07/21 20:38:21 pollita Exp $
+dnl $Id: config.m4,v 1.10 2006/03/15 02:10:23 pollita Exp $
 dnl config.m4 for extension ssh2
 
 PHP_ARG_WITH(ssh2, for ssh2 support,
@@ -7,7 +7,7 @@
 if test "$PHP_SSH2" != "no"; then
   SEARCH_PATH="/usr/local /usr"
   SEARCH_FOR="/include/libssh2.h"
-  if test -r $PHP_SSH2/; then # path given as parameter
+  if test -r $PHP_SSH2/$SEARCH_FOR; then # path given as parameter
     SSH2_DIR=$PHP_SSH2
   else
     AC_MSG_CHECKING([for ssh2 files in default path])
@@ -31,12 +31,12 @@
 
   PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
   [
-    PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/lib, SSH2_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/$PHP_LIBDIR, SSH2_SHARED_LIBADD)
     AC_DEFINE(HAVE_SSH2LIB,1,[Have libssh2])
   ],[
     AC_MSG_ERROR([libssh2 version >= 0.4 not found])
   ],[
-    -L$SSH2_DIR/lib -lm -ldl
+    -L$SSH2_DIR/$PHP_LIBDIR -lm 
   ])
 
   PHP_CHECK_LIBRARY($LIBNAME,libssh2_channel_forward_listen_ex,
@@ -44,6 +44,8 @@
     AC_DEFINE(PHP_SSH2_REMOTE_FORWARDING, 1, [Have libssh2 with remote forwarding])
   ],[
     AC_MSG_WARN([libssh2 <= 0.4, remote forwarding not enabled])
+  ],[
+    -L$SSH2_DIR/$PHP_LIBDIR -lm 
   ])
 
   PHP_CHECK_LIBRARY($LIBNAME,libssh2_userauth_hostbased_fromfile_ex,
@@ -51,6 +53,8 @@
     AC_DEFINE(PHP_SSH2_HOSTBASED_AUTH, 1, [Have libssh2 with hostbased authentication])
   ],[
     AC_MSG_WARN([libssh2 <= 0.6, hostbased authentication not enabled])
+  ],[
+    -L$SSH2_DIR/$PHP_LIBDIR -lm 
   ])
 
   PHP_CHECK_LIBRARY($LIBNAME,libssh2_poll,
@@ -58,6 +62,8 @@
     AC_DEFINE(PHP_SSH2_POLL, 1, [Have libssh2 with poll() support])
   ],[
     AC_MSG_WARN([libssh2 <= 0.7, poll support not enabled])
+  ],[
+    -L$SSH2_DIR/$PHP_LIBDIR -lm 
   ])
 
   PHP_CHECK_LIBRARY($LIBNAME,libssh2_publickey_init,
@@ -65,6 +71,8 @@
     AC_DEFINE(PHP_SSH2_PUBLICKEY_SUBSYSTEM, 1, [Have libssh2 with publickey subsystem support])
   ],[
     AC_MSG_WARN([libssh2 <= 0.11, publickey subsystem support not enabled])
+  ],[
+    -L$SSH2_DIR/$PHP_LIBDIR -lm 
   ])
   
   PHP_SUBST(SSH2_SHARED_LIBADD)