* ltconfig.in (sub_uncdrive): removed. This won't work with

the next version of cygwin.
(sub_uncdir): removed. We use <drive>:/path/to/executable now.
* libtool.m4 (AC_PROG_LD): removed sub_uncdrive and sub_uncdir.

diff --git a/ChangeLog b/ChangeLog
index dda46e166cae20bf2d485dd5ca0eae4d44e2b170..c1afb1fc945eec6c670bec639e62458899839505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-02-26  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+
+       * ltconfig.in (sub_uncdrive): removed.  This won't work with
+       the next version of cygwin.
+       (sub_uncdir): removed. We use <drive>:/path/to/executable now.
+       * libtool.m4 (AC_PROG_LD): removed sub_uncdrive and sub_uncdir.
+
 1999-02-25  Thomas Tanner  <tanner@gmx.de>
 
        * updated to HEAD

diff --git a/libtool.m4 b/libtool.m4
index 42c90ca482b3c22ea28cefe34cdb72a86a967237..8f0c9aa311ffa49efed5d4927db86359bd5b68ef 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -273,47 +273,15 @@ if test "$ac_cv_prog_gcc" = yes; then
   case "$ac_prog" in
     # Accept absolute paths.
 changequote(,)dnl
-    /* | [A-Za-z]:/*)
-      # Canonicalize the path of ld
+    /* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
 changequote([,])dnl
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-       # Convert to a UNC path for cygwin
-       test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
-       ;;
-      *)
-       test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-changequote(,)dnl
-    [A-Za-z]:[\\]*)
       # Canonicalize the path of ld
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-changequote([,])dnl
-      sub_uncdir='s%\\%/%g'
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+       ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
-      case "$host_os" in
-      cygwin*)
-       # Convert to a UNC path for cygwin
-       test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
-       ;;
-      *)
-       test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
+      test -z "$LD" && LD="$ac_prog"
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -357,6 +325,7 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+
 AC_SUBST(LD)
 AC_PROG_LD_GNU
 ])

diff --git a/ltconfig.in b/ltconfig.in
index afc69ca947f96f67dbbbf8a408fbbbe6d413b6f4..d0048b414c7a7a7c17c3eecf2925b28249c18db4 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -911,44 +911,14 @@ if test -z "$LD"; then
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
-    /* | [A-Za-z]:/*)
+    /* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
       # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
-      case "$host_os" in
-      cygwin*)
-       # Convert to a UNC path for cygwin
-       test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-       ;;
-      *)
-       test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-    [A-Za-z]:[\\]*)
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-      sub_uncdir='s%\\%/%g'
-      # Canonicalize the path of ld
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
-      done
-      case "$host_os" in
-      cygwin*)
-       # Convert to a UNC path for cygwin
-       test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive" -e "$sub_uncdir"`
-       ;;
-      *)
-       test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
+      test -z "$LD" && LD="$ac_prog"
       ;;
     "")
       # If it fails, then pretend we are not using GCC.
@@ -971,8 +941,8 @@ if test -z "$LD"; then
     IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
     for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog"; then
-       LD="$ac_dir/$ac_prog"
+      if test -f "${ac_dir}/${ac_prog}"; then
+       LD="${ac_dir}/${ac_prog}"
        # Check to see if the program is GNU ld.  I'd rather use --version,
        # but apparently some GNU ld's only accept -v.
        # Break only if it was the GNU/non-GNU ld that we prefer.