equal
deleted
inserted
replaced
146 # Input might be given as Windows format, start by converting to |
146 # Input might be given as Windows format, start by converting to |
147 # unix format. |
147 # unix format. |
148 path="[$]$1" |
148 path="[$]$1" |
149 new_path=`$CYGPATH -u "$path"` |
149 new_path=`$CYGPATH -u "$path"` |
150 |
150 |
|
151 BASIC_ABSOLUTE_PATH(new_path) |
|
152 |
151 # Cygwin tries to hide some aspects of the Windows file system, such that binaries are |
153 # Cygwin tries to hide some aspects of the Windows file system, such that binaries are |
152 # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered |
154 # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered |
153 # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then |
155 # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then |
154 # "foo.exe" is OK but "foo" is an error. |
156 # "foo.exe" is OK but "foo" is an error. |
155 # |
157 # |
179 if test "x$has_colon" = x; then |
181 if test "x$has_colon" = x; then |
180 # Not in mixed or Windows style, start by that. |
182 # Not in mixed or Windows style, start by that. |
181 new_path=`cmd //c echo $path` |
183 new_path=`cmd //c echo $path` |
182 fi |
184 fi |
183 |
185 |
|
186 BASIC_ABSOLUTE_PATH(new_path) |
|
187 |
184 BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) |
188 BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) |
185 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
189 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
186 if test "x$path" != "x$new_path"; then |
190 if test "x$path" != "x$new_path"; then |
187 $1="$new_path" |
191 $1="$new_path" |
188 AC_MSG_NOTICE([Rewriting $1 to "$new_path"]) |
192 AC_MSG_NOTICE([Rewriting $1 to "$new_path"]) |
196 [ |
200 [ |
197 # Input might be given as Windows format, start by converting to |
201 # Input might be given as Windows format, start by converting to |
198 # unix format. |
202 # unix format. |
199 new_path="[$]$1" |
203 new_path="[$]$1" |
200 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
204 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
|
205 |
|
206 BASIC_ABSOLUTE_PATH(new_path) |
201 |
207 |
202 # Call helper function which possibly converts this using DOS-style short mode. |
208 # Call helper function which possibly converts this using DOS-style short mode. |
203 # If so, the updated path is stored in $new_path. |
209 # If so, the updated path is stored in $new_path. |
204 BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL([$new_path]) |
210 BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL([$new_path]) |
205 |
211 |