[maemo-commits] [maemo-commits] r17897 - projects/haf/trunk/gvfs-1.0.3/debian/patches

Mon Mar 30 23:17:55 EEST 2009

Author: marivoll
Date: 2009-03-30 23:17:44 +0300 (Mon, 30 Mar 2009)
New Revision: 17897

Modified:
   projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch
Log:
Updated patches to also include regenerated files.


Modified: projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch
===================================================================

--- projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch	2009-03-30 17:28:54 UTC (rev 17896)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch	2009-03-30 20:17:44 UTC (rev 17897)
@@ -1,7 +1,7 @@
 Index: daemon/Makefile.am
 ===================================================================
---- daemon/Makefile.am.orig	2009-03-30 18:57:17.000000000 +0300
-+++ daemon/Makefile.am	2009-03-30 19:56:53.000000000 +0300
+--- daemon/Makefile.am.orig	2009-03-30 19:58:24.000000000 +0300
++++ daemon/Makefile.am	2009-03-30 20:23:19.000000000 +0300
 @@ -16,10 +16,10 @@
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
  	-DG_DISABLE_DEPRECATED
@@ -35,3 +35,249 @@
  gvfsd_SOURCES = \
  	mount.c mount.h \
  	main.c
+Index: daemon/Makefile.in
+===================================================================
+--- daemon/Makefile.in.orig	2009-03-30 23:09:13.000000000 +0300
++++ daemon/Makefile.in	2009-03-30 23:09:34.000000000 +0300
+@@ -66,24 +66,37 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libdaemon_la_LIBADD =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" \
++	"$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libgvfsdaemon_la_DEPENDENCIES =  \
++	$(top_builddir)/common/libgvfscommon.la $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+-am_libdaemon_la_OBJECTS = gvfsdaemon.lo gvfsbackend.lo gvfschannel.lo \
+-	gvfsreadchannel.lo gvfswritechannel.lo gvfsmonitor.lo \
+-	gvfsdaemonutils.lo gvfsjob.lo gvfsjobsource.lo gvfsjobdbus.lo \
+-	gvfsjobmount.lo gvfsjobunmount.lo gvfsjobmountmountable.lo \
+-	gvfsjobunmountmountable.lo gvfsjobopenforread.lo \
+-	gvfsjobread.lo gvfsjobseekread.lo gvfsjobcloseread.lo \
+-	gvfsjobopenforwrite.lo gvfsjobwrite.lo gvfsjobseekwrite.lo \
+-	gvfsjobclosewrite.lo gvfsjobqueryinfo.lo gvfsjobqueryfsinfo.lo \
+-	gvfsjobenumerate.lo gvfsjobsetdisplayname.lo gvfsjobtrash.lo \
+-	gvfsjobdelete.lo gvfsjobcopy.lo gvfsjobmove.lo gvfsjobpush.lo \
+-	gvfsjobpull.lo gvfsjobmakedirectory.lo gvfsjobmakesymlink.lo \
++am_libgvfsdaemon_la_OBJECTS = gvfsdaemon.lo gvfsbackend.lo \
++	gvfschannel.lo gvfsreadchannel.lo gvfswritechannel.lo \
++	gvfsmonitor.lo gvfsdaemonutils.lo gvfsjob.lo gvfsjobsource.lo \
++	gvfsjobdbus.lo gvfsjobmount.lo gvfsjobunmount.lo \
++	gvfsjobmountmountable.lo gvfsjobunmountmountable.lo \
++	gvfsjobopenforread.lo gvfsjobread.lo gvfsjobseekread.lo \
++	gvfsjobcloseread.lo gvfsjobopenforwrite.lo gvfsjobwrite.lo \
++	gvfsjobseekwrite.lo gvfsjobclosewrite.lo gvfsjobqueryinfo.lo \
++	gvfsjobqueryfsinfo.lo gvfsjobenumerate.lo \
++	gvfsjobsetdisplayname.lo gvfsjobtrash.lo gvfsjobdelete.lo \
++	gvfsjobcopy.lo gvfsjobmove.lo gvfsjobpush.lo gvfsjobpull.lo \
++	gvfsjobmakedirectory.lo gvfsjobmakesymlink.lo \
+ 	gvfsjobsetattribute.lo gvfsjobqueryattributes.lo \
+ 	gvfsjobcreatemonitor.lo dbus-gmain.lo gvfskeyring.lo \
+ 	$(am__objects_1)
+-libdaemon_la_OBJECTS = $(am_libdaemon_la_OBJECTS)
++libgvfsdaemon_la_OBJECTS = $(am_libgvfsdaemon_la_OBJECTS)
+ @HAVE_HTTP_TRUE at am__EXEEXT_1 = gvfsd-http$(EXEEXT) gvfsd-dav$(EXEEXT) \
+ @HAVE_HTTP_TRUE@	gvfsd-ftp$(EXEEXT)
+ @HAVE_SAMBA_TRUE at am__EXEEXT_2 = gvfsd-smb-browse$(EXEEXT) \
+@@ -94,15 +107,12 @@
+ @USE_OBEXFTP_TRUE at am__EXEEXT_6 = gvfsd-obexftp$(EXEEXT)
+ @HAVE_AVAHI_TRUE at am__EXEEXT_7 = gvfsd-dnssd$(EXEEXT)
+ @HAVE_ARCHIVE_TRUE at am__EXEEXT_8 = gvfsd-archive$(EXEEXT)
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" \
+-	"$(DESTDIR)$(servicedir)"
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ am__EXEEXT_9 =
+ PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ am_gvfsd_OBJECTS = mount.$(OBJEXT) main.$(OBJEXT)
+ gvfsd_OBJECTS = $(am_gvfsd_OBJECTS)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = libdaemon.la \
++am__DEPENDENCIES_2 = libgvfsdaemon.la \
+ 	$(top_builddir)/common/libgvfscommon.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ gvfsd_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@@ -222,7 +232,7 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(libdaemon_la_SOURCES) $(gvfsd_SOURCES) \
++SOURCES = $(libgvfsdaemon_la_SOURCES) $(gvfsd_SOURCES) \
+ 	$(gvfsd_archive_SOURCES) $(gvfsd_burn_SOURCES) \
+ 	$(gvfsd_cdda_SOURCES) $(gvfsd_computer_SOURCES) \
+ 	$(gvfsd_dav_SOURCES) $(gvfsd_dnssd_SOURCES) \
+@@ -232,7 +242,7 @@
+ 	$(gvfsd_sftp_SOURCES) $(gvfsd_smb_SOURCES) \
+ 	$(gvfsd_smb_browse_SOURCES) $(gvfsd_test_SOURCES) \
+ 	$(gvfsd_trash_SOURCES)
+-DIST_SOURCES = $(libdaemon_la_SOURCES) $(gvfsd_SOURCES) \
++DIST_SOURCES = $(libgvfsdaemon_la_SOURCES) $(gvfsd_SOURCES) \
+ 	$(gvfsd_archive_SOURCES) $(gvfsd_burn_SOURCES) \
+ 	$(gvfsd_cdda_SOURCES) $(gvfsd_computer_SOURCES) \
+ 	$(gvfsd_dav_SOURCES) $(gvfsd_dnssd_SOURCES) \
+@@ -242,12 +252,6 @@
+ 	$(gvfsd_sftp_SOURCES) $(gvfsd_smb_SOURCES) \
+ 	$(gvfsd_smb_browse_SOURCES) $(gvfsd_test_SOURCES) \
+ 	$(gvfsd_trash_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ mountDATA_INSTALL = $(INSTALL_DATA)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mount_DATA) $(service_DATA)
+@@ -441,9 +445,9 @@
+ 	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+ 	-DG_DISABLE_DEPRECATED
+ 
+-noinst_LTLIBRARIES = libdaemon.la
++lib_LTLIBRARIES = libgvfsdaemon.la
+ libraries = \
+-	libdaemon.la					\
++	libgvfsdaemon.la					\
+ 	$(top_builddir)/common/libgvfscommon.la		\
+ 	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ 
+@@ -462,7 +466,7 @@
+ @USE_OBEXFTP_TRUE at BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
+ EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
+ DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ 	gvfsdaemon.c gvfsdaemon.h \
+ 	gvfsbackend.c gvfsbackend.h \
+ 	gvfschannel.c gvfschannel.h \
+@@ -504,6 +508,10 @@
+ 	gvfskeyring.h gvfskeyring.c \
+         $(NULL)
+ 
++libgvfsdaemon_la_LIBADD = \
++	$(top_builddir)/common/libgvfscommon.la		\
++	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++
+ gvfsd_SOURCES = \
+ 	mount.c mount.h \
+ 	main.c
+@@ -768,17 +776,35 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	  else :; fi; \
++	done
+ 
+-clean-noinstLTLIBRARIES:
+-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	done
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libdaemon.la: $(libdaemon_la_OBJECTS) $(libdaemon_la_DEPENDENCIES) 
+-	$(LINK)  $(libdaemon_la_OBJECTS) $(libdaemon_la_LIBADD) $(LIBS)
++libgvfsdaemon.la: $(libgvfsdaemon_la_OBJECTS) $(libgvfsdaemon_la_DEPENDENCIES) 
++	$(LINK) -rpath $(libdir) $(libgvfsdaemon_la_OBJECTS) $(libgvfsdaemon_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
+@@ -1971,7 +1997,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(mountdir)" "$(DESTDIR)$(servicedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -2003,8 +2029,8 @@
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
+-	clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am
++clean-am: clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \
++	clean-libtool clean-noinstPROGRAMS mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+@@ -2026,7 +2052,7 @@
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-libexecPROGRAMS
++install-exec-am: install-libLTLIBRARIES install-libexecPROGRAMS
+ 
+ install-html: install-html-am
+ 
+@@ -2058,26 +2084,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-libexecPROGRAMS uninstall-mountDATA \
+-	uninstall-serviceDATA
++uninstall-am: uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \
++	uninstall-mountDATA uninstall-serviceDATA
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \
++	clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-data install-data-am install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+-	install-info install-info-am install-libexecPROGRAMS \
+-	install-man install-mountDATA install-pdf install-pdf-am \
+-	install-ps install-ps-am install-serviceDATA install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-libexecPROGRAMS \
+-	uninstall-mountDATA uninstall-serviceDATA
++	install-info install-info-am install-libLTLIBRARIES \
++	install-libexecPROGRAMS install-man install-mountDATA \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-serviceDATA install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-libLTLIBRARIES \
++	uninstall-libexecPROGRAMS uninstall-mountDATA \
++	uninstall-serviceDATA
+ 
+ 
+ # D-BUS service file

Modified: projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch	2009-03-30 17:28:54 UTC (rev 17896)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch	2009-03-30 20:17:44 UTC (rev 17897)
@@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
---- configure.ac.orig	2009-03-30 19:41:33.000000000 +0300
-+++ configure.ac	2009-03-30 19:58:00.000000000 +0300
+--- configure.ac.orig	2009-03-30 23:08:58.000000000 +0300
++++ configure.ac	2009-03-30 23:10:06.000000000 +0300
 @@ -97,7 +97,12 @@
  dnl *** Checks for ssh stuff ***
  dnl ****************************
@@ -16,3 +16,231 @@
  
  dnl ****************************
  dnl *** Checks for pty stuff ***
+Index: configure
+===================================================================
+--- configure.orig	2009-03-30 23:10:25.000000000 +0300
++++ configure	2009-03-30 23:10:37.000000000 +0300
+@@ -841,7 +841,6 @@
+ HAVE_HTTP_TRUE
+ HTTP_LIBS
+ HTTP_CFLAGS
+-SSH_PROGRAM
+ MKINSTALLDIRS
+ POSUB
+ POFILES
+@@ -6027,7 +6026,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 6030 "configure"' > conftest.$ac_ext
++  echo '#line 6029 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8871,11 +8870,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8874: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8873: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8878: \$? = $ac_status" >&5
++   echo "$as_me:8877: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9161,11 +9160,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9164: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9163: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9168: \$? = $ac_status" >&5
++   echo "$as_me:9167: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9265,11 +9264,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9268: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9267: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9272: \$? = $ac_status" >&5
++   echo "$as_me:9271: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11678,7 +11677,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11681 "configure"
++#line 11680 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11778,7 +11777,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11781 "configure"
++#line 11780 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14187,11 +14186,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14190: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14189: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14194: \$? = $ac_status" >&5
++   echo "$as_me:14193: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -14291,11 +14290,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14294: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14293: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14298: \$? = $ac_status" >&5
++   echo "$as_me:14297: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15889,11 +15888,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15892: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15891: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15896: \$? = $ac_status" >&5
++   echo "$as_me:15895: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15993,11 +15992,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15996: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15995: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16000: \$? = $ac_status" >&5
++   echo "$as_me:15999: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18221,11 +18220,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18224: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18223: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18228: \$? = $ac_status" >&5
++   echo "$as_me:18227: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18511,11 +18510,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18514: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18513: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18518: \$? = $ac_status" >&5
++   echo "$as_me:18517: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18615,11 +18614,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18618: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18617: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18622: \$? = $ac_status" >&5
++   echo "$as_me:18621: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -25181,47 +25180,9 @@
+ 
+ 
+ 
+-# Extract the first word of "ssh", so it can be a program name with args.
+-set dummy ssh; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SSH_PROGRAM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $SSH_PROGRAM in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_SSH_PROGRAM="$SSH_PROGRAM" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_SSH_PROGRAM="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_SSH_PROGRAM" && ac_cv_path_SSH_PROGRAM=""ssh""
+-  ;;
+-esac
+-fi
+-SSH_PROGRAM=$ac_cv_path_SSH_PROGRAM
+-if test -n "$SSH_PROGRAM"; then
+-  { $as_echo "$as_me:$LINENO: result: $SSH_PROGRAM" >&5
+-$as_echo "$SSH_PROGRAM" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+ 
+ 
++SSH_PROGRAM="ssh"
+ 
+ 
+ 


