[Emacs-diffs] trunk r114393: Fix MinGW builds from inside the MSYS installation tree.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114393
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-19 11:43:01 +0300
message:
  Fix MinGW builds from inside the MSYS installation tree.
  
   configure.ac <srcdir> [MINGW32]: Make sure the value of 'srcdir'
   is in the full /d/foo/bar form.  See the discussion in
   http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00210.html,
   and in particular
   http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00252.html
   and its followups, for the details.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-09-17 06:33:24 +0000
+++ b/ChangeLog 2013-09-19 08:43:01 +0000
@@ -1,3 +1,12 @@
+2013-09-19  Eli Zaretskii  <address@hidden>
+
+       * configure.ac <srcdir> [MINGW32]: Make sure the value of 'srcdir'
+       is in the full /d/foo/bar form.  See the discussion in
+       http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00210.html,
+       and in particular
+       http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00252.html
+       and its followups, for the details.
+
 2013-09-17  Dmitry Antipov  <address@hidden>
 
        * configure.ac: Do not check for g_type_init because we

=== modified file 'configure.ac'
--- a/configure.ac      2013-09-17 06:33:24 +0000
+++ b/configure.ac      2013-09-19 08:43:01 +0000
@@ -443,6 +443,17 @@
   *  ) srcdir=`(cd "$srcdir"; pwd)` ;;
 esac
 
+#### When building with MinGW inside the MSYS tree, 'pwd' produces
+#### directories relative to the root of the MSYS tree,
+#### e.g. '/home/user/foo' instead of '/d/MSYS/home/user/foo'.  When
+#### such a value of srcdir is written to the top-level Makefile, it
+#### gets propagated to src/epaths.h, and that causes temacs to fail,
+#### because, being a MinGW program that knows nothing of MSYS root
+#### substitution, it cannot find the data directory.  "pwd -W"
+#### produces Windows-style 'd:/foo/bar' absolute directory names, so
+#### we use it here to countermand that lossage.
+test "$MSYSTEM" = "MINGW32" && srcdir=`(cd "$srcdir"; pwd -W | sed -e 
's,^\([[A-Za-z]]\):,/\1,')`
+
 ### Canonicalize the configuration name.
 
 AC_CANONICAL_HOST