← Back to branch summary

~lauri-vosandi/openssh/openssh

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: djm
  • Date: 2012-07-06 01:49:28 UTC
  • Revision ID: djm-20120706014928-qyhwobd6llg9y13h
 - (djm) [configure.ac] Recursively expand $(bindir) to ensure it has no
   unexpanded $(prefix) embedded. bz#2007 patch from nix-corp AT
   esperi.org.uk; ok dtucker@

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
# $Id: configure.ac,v 1.495 2012/07/03 22:50:10 dtucker Exp $
 
1
# $Id: configure.ac,v 1.496 2012/07/06 01:49:29 djm Exp $
2
2
#
3
3
# Copyright (c) 1999-2004 Damien Miller
4
4
#
15
15
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16
16
 
17
17
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18
 
AC_REVISION($Revision: 1.495 $)
 
18
AC_REVISION($Revision: 1.496 $)
19
19
AC_CONFIG_SRCDIR([ssh.c])
20
20
AC_LANG([C])
21
21
 
4005
4005
                [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ]
4006
4006
        )
4007
4007
# make sure $bindir is in USER_PATH so scp will work
4008
 
                t_bindir=`eval echo ${bindir}`
4009
 
                case $t_bindir in
4010
 
                        NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;;
4011
 
                esac
4012
 
                case $t_bindir in
4013
 
                        NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;;
4014
 
                esac
 
4008
                t_bindir="${bindir}"
 
4009
                while echo "${t_bindir}" | egrep '\$\{|NONE/' >/dev/null 2>&1; do
 
4010
                        t_bindir=`eval echo ${t_bindir}`
 
4011
                        case $t_bindir in
 
4012
                                NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;;
 
4013
                        esac
 
4014
                        case $t_bindir in
 
4015
                                NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;;
 
4016
                        esac
 
4017
                done
4015
4018
                echo $user_path | grep ":$t_bindir"  > /dev/null 2>&1
4016
4019
                if test $? -ne 0  ; then
4017
4020
                        echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1