2 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ba36b72f739..c3bb41bd7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,9 @@
 
 2013-12-14  Dani Moncayo  <dmoncayo@gmail.com>
 
-        * configure.ac (srcdir) [MINGW32]: Convert to an absolute MSYS
-        path of the form "/c/foo/bar" to simplify conversion of formats.
+        * configure.ac (srcdir) [MINGW32]: If it is an absolute path,
+        force the format "/c/foo/bar" to simplify conversions to native
+        windows format.
 
 2013-12-13  Glenn Morris  <rgm@gnu.org>
 
diff --git a/configure.ac b/configure.ac
index 9e4ef127534..6d0ba7c851a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,14 @@ if test "x$MSYSTEM" = "xMINGW32"
 then
    . $srcdir/nt/mingw-cfg.site
 
-   # Convert srcdir to an absolute MSYS path of the form "/c/foo/bar"
-   # to simplify later conversions of paths to windows-native format
-   # "c:/foo/bar"
-   srcdir=`cd "${srcdir}" && pwd -W`
-   srcdir="/${srcdir:0:1}${srcdir:2}"
+   if test ${srcdir:0:1} = "/" -o ${srcdir:1:1} = ":"
+   then
+       # srcdir is an absolute path.  In this case, force the format
+       # "/c/foo/bar", to simplify later conversions to native Windows
+       # format ("c:/foo/bar")
+       srcdir=`cd "${srcdir}" && pwd -W`
+       srcdir="/${srcdir:0:1}${srcdir:2}"
+   fi
 fi
 
 dnl Set emacs_config_options to the options of 'configure', quoted for the shell,