Attachment #597652 for bug #701368

View | Details | Raw Unified | Return to bug 701368
Collapse All | Expand All

Lines 3244-3250 else Link Here

(-)scponly-4.8-orig/configure (-2 / +2 lines)
3244	;;	3244	;;
3245	*)	3245	*)
3246	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	3246	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3247	as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" \| sed -e 's/:/ /'`"	3247	as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" \| sed -e 's/:/ /'`"
3248	for as_dir in $as_dummy	3248	for as_dir in $as_dummy
3249	do	3249	do
3250	IFS=$as_save_IFS	3250	IFS=$as_save_IFS
Lines 4240-4246 else Link Here
4240	;;	4240	;;
4241	*)	4241	*)
4242	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	4242	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4243	as_dummy="`echo "$PATH:/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" \| sed -e 's/:/ /'`"	4243	as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" \| sed -e 's/:/ /'`"
4244	for as_dir in $as_dummy	4244	for as_dir in $as_dummy
4245	do	4245	do
4246	IFS=$as_save_IFS	4246	IFS=$as_save_IFS

Return to bug 701368

Lines 231-237 AC_ARG_ENABLE([quota-compat], Link Here

(-)scponly-4.8-orig/configure.in (-2 / +2 lines)
231		231
232	if test "x$scponly_scp_compat" != "x"; then	232	if test "x$scponly_scp_compat" != "x"; then
233	AC_MSG_NOTICE([enabling core WinSCP and Vanilla SCP binaries...])	233	AC_MSG_NOTICE([enabling core WinSCP and Vanilla SCP binaries...])
234	SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh])	234	SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh])
235	SCPONLY_PATH_PROG_DEFINE([PROG_LS], [ls], [/bin:/usr/bin:/sbin:/usr/sbin])	235	SCPONLY_PATH_PROG_DEFINE([PROG_LS], [ls], [/bin:/usr/bin:/sbin:/usr/sbin])
236	SCPONLY_PATH_PROG_DEFINE([PROG_SCP], [scp], [/bin:/usr/bin:/sbin:/usr/sbin])	236	SCPONLY_PATH_PROG_DEFINE([PROG_SCP], [scp], [/bin:/usr/bin:/sbin:/usr/sbin])
237	SCPONLY_PATH_PROG_DEFINE([PROG_RM], [rm], [/bin:/usr/bin:/sbin:/usr/sbin])	237	SCPONLY_PATH_PROG_DEFINE([PROG_RM], [rm], [/bin:/usr/bin:/sbin:/usr/sbin])
Lines 297-303 if test "x$scponly_sftp_compat" != "x"; Link Here
297	if test "x$scponly_explicit_sftpserver_path" = "x"; then	297	if test "x$scponly_explicit_sftpserver_path" = "x"; then
298	dnl Informed guess:	298	dnl Informed guess:
299	SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],	299	SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],
300	[/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec])	300	[/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec])
301	dnl Debian uses /usr/lib	301	dnl Debian uses /usr/lib
302	dnl Red Hat uses /usr/libexec/openssh	302	dnl Red Hat uses /usr/libexec/openssh
303	dnl Many a *BSD uses $PATH itself (which is implicit + checked 1st)	303	dnl Many a *BSD uses $PATH itself (which is implicit + checked 1st)