[maemo-commits] [maemo-commits] r17855 - projects/haf/trunk/gvfs-1.0.3

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-03-27 21:21:08 +0200 (Fri, 27 Mar 2009)
New Revision: 17855

Added:
   projects/haf/trunk/gvfs-1.0.3/runtime-ssh.patch
Modified:
   projects/haf/trunk/gvfs-1.0.3/configure.ac
Log:
Applied runtime-ssh.patch.


Modified: projects/haf/trunk/gvfs-1.0.3/configure.ac
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/configure.ac	2009-03-27 19:19:49 UTC (rev 17854)
+++ projects/haf/trunk/gvfs-1.0.3/configure.ac	2009-03-27 19:21:08 UTC (rev 17855)
@@ -96,8 +96,13 @@
 dnl *** Checks for ssh stuff ***
 dnl ****************************
 
-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
+dnl AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
 
+dnl Don't try to find ssh, that might pin it to a path that is wrong
+dnl at run-time.  (Such as when building in Scratchbox.)
+
+SSH_PROGRAM="ssh"
+
 dnl ****************************
 dnl *** Checks for pty stuff ***
 dnl ****************************

Added: projects/haf/trunk/gvfs-1.0.3/runtime-ssh.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/runtime-ssh.patch	2009-03-27 19:19:49 UTC (rev 17854)
+++ projects/haf/trunk/gvfs-1.0.3/runtime-ssh.patch	2009-03-27 19:21:08 UTC (rev 17855)
@@ -0,0 +1,18 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 17849)
++++ configure.ac	(working copy)
+@@ -96,7 +96,12 @@ dnl ****************************
+ dnl *** Checks for ssh stuff ***
+ dnl ****************************
+ 
+-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
++dnl AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
++
++dnl Don't try to find ssh, that might pin it to a path that is wrong
++dnl at run-time.  (Such as when building in Scratchbox.)
++
++SSH_PROGRAM="ssh"
+ 
+ dnl ****************************
+ dnl *** Checks for pty stuff ***