rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Filter --srcdir= option before invoking builds/unix/configure.

This commit is contained in:
suzuki toshiya 2009-06-27 14:33:06 +09:00
parent 20fb146351
commit 66d308edfd
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Filter --srcdir= option before invoking builds/unix/configure.
* configure: When builds/unix/configure is invoked with --srcdir
option, the option should take "builds/unix" directory instead
of the top source directory. Thus configure in the top directory
should modify --srcdir= option when builds/unix/configure is
invoked.
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Improve configure.raw for cross-building on exe-suffixed systems.

16
configure vendored
View File

@ -67,6 +67,17 @@ ft2_dir=`(dirname "$0") 2>/dev/null ||
abs_curr_dir=`pwd`
abs_ft2_dir=`cd "$ft2_dir" && pwd`
# "--srcdir=" option can override abs_ft2_dir.
if test $# -gt 0; then
for x in "$@"; do
case x"$x" in
x--srcdir=*)
abs_ft2_dir=`echo $x | sed 's/^--srcdir=//'` ;;
esac
done
fi
# build a dummy Makefile if we are not building in the source tree
if test "$abs_curr_dir" != "$abs_ft2_dir"; then
@ -96,7 +107,10 @@ CFG=
case $# in
0) ;;
*) for x in "$@"; do
CFG="$CFG '$x'"
case x"$x" in
x--srcdir=* ) CFG="$CFG '$x'/builds/unix" ;;
*) CFG="$CFG '$x'" ;;
esac
done ;;
esac
CFG=$CFG $GNUMAKE setup unix