Avoid `configure' issues with symbolic links.

Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.

* configure: Compare directories using `ls -id'.
Check existence of `reference' subdirectory before creating it.
This commit is contained in:
Werner Lemberg 2010-10-03 20:17:27 +02:00
parent 3987b15ef7
commit 75eeb32a2e
2 changed files with 17 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2010-10-03 Werner Lemberg <wl@gnu.org>
Avoid `configure' issues with symbolic links.
Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
* configure: Compare directories using `ls -id'.
Check existence of `reference' subdirectory before creating it.
2010-10-02 Werner Lemberg <wl@gnu.org> 2010-10-02 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #31088 (sort of). Fix Savannah bug #31088 (sort of).

13
configure vendored
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009 by # Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -78,10 +78,15 @@ if test $# -gt 0; then
done done
fi fi
# build a dummy Makefile if we are not building in the source tree # build a dummy Makefile if we are not building in the source tree;
# we use inodes to avoid issues with symbolic links
inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
if test "$abs_curr_dir" != "$abs_ft2_dir"; then if test $inode_src -ne $inode_dst; then
mkdir reference if test ! -d reference; then
mkdir reference
fi
if test ! -r $abs_curr_dir/modules.cfg; then if test ! -r $abs_curr_dir/modules.cfg; then
echo "Copying \`modules.cfg'" echo "Copying \`modules.cfg'"
cp $abs_ft2_dir/modules.cfg $abs_curr_dir cp $abs_ft2_dir/modules.cfg $abs_curr_dir