procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MinGW builds from inside the MSYS installation tree.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2013-09-19 11:43:01 +03:00
parent 13d9698ae4
commit be9bc55efd
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2013-09-19 Eli Zaretskii <eliz@gnu.org>
* 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 <dmantipov@yandex.ru>
* configure.ac: Do not check for g_type_init because we

11
configure.ac
View file

@ -443,6 +443,17 @@ case "${srcdir}" in
* ) 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