* 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 8d0cd05b21d4b341c18fd07d59e0a3ff25fbb420..0dc8c41c37eb6c40e1fe6a0885a335c7a0919524 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>
 
        * TODO: added items for next alpha release, ILD etc.

diff --git a/libtool.m4 b/libtool.m4
index ec4f032e89bff41ff46b75627af6d5930c8a111d..4fc1e1c99ac528f14579051ef36232c46505ca9d 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -237,47 +237,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.

diff --git a/ltconfig.in b/ltconfig.in
index 7e734fbe6f52347820c507dc6a4e2ec6edb219b1..5e34495556c7be8d744d397cd2d6368f72495a97 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -907,44 +907,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.