Diff for /embedaddon/libiconv/srcm4/lib-ld.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.2, 2012/05/29 09:29:44
Line 1 Line 1
# lib-ld.m4 serial 4 (gettext-0.18)# lib-ld.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc.dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
Line 31  AC_REQUIRE([AC_CANONICAL_HOST])dnl Line 31  AC_REQUIRE([AC_CANONICAL_HOST])dnl
 # Prepare PATH_SEPARATOR.  # Prepare PATH_SEPARATOR.
 # The user is always right.  # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then  if test "${PATH_SEPARATOR+set}" != set; then
  echo "#! /bin/sh" >conf$$.sh  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
  echo  "exit 0"   >>conf$$.sh  # contains only /bin. Note that ksh looks also at the FPATH variable,
  chmod +x conf$$.sh  # so we have to set that as well for the test.
  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then  PATH_SEPARATOR=:
    PATH_SEPARATOR=';'  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
  else    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
    PATH_SEPARATOR=:           || PATH_SEPARATOR=';'
  fi       }
  rm -f conf$$.sh 
 fi  fi
 ac_prog=ld  ac_prog=ld
 if test "$GCC" = yes; then  if test "$GCC" = yes; then
Line 59  if test "$GCC" = yes; then Line 58  if test "$GCC" = yes; then
       # Canonicalize the path of ld        # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`        ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do        while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done        done
       test -z "$LD" && LD="$ac_prog"        test -z "$LD" && LD="$ac_prog"
       ;;        ;;
Line 89  AC_CACHE_VAL([acl_cv_path_LD], Line 88  AC_CACHE_VAL([acl_cv_path_LD],
       # Break only if it was the GNU/non-GNU ld that we prefer.        # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in        case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)        *GNU* | *'with BFD'*)
        test "$with_gnu_ld" != no && break ;;        test "$with_gnu_ld" != no && break ;;
       *)        *)
        test "$with_gnu_ld" != yes && break ;;        test "$with_gnu_ld" != yes && break ;;
       esac        esac
     fi      fi
   done    done

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>