1
0
forked from aniani/vim

patch 7.4.924

Problem:    DEVELOPER_DIR gets reset by configure.
Solution:   Do not reset DEVELOPER_DIR when there is no --with-developer-dir
            argument. (Kazuki Sakamoto, closes #482)
This commit is contained in:
Bram Moolenaar
2015-11-19 13:46:48 +01:00
parent 6a2697ffd7
commit 32d03b34ac
3 changed files with 4 additions and 2 deletions

2
src/auto/configure vendored
View File

@@ -4198,7 +4198,7 @@ if test "${with_developer_dir+set}" = set; then :
withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5
$as_echo "$DEVELOPER_DIR" >&6; } $as_echo "$DEVELOPER_DIR" >&6; }
else else
DEVELOPER_DIR=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5
$as_echo "not present" >&6; } $as_echo "not present" >&6; }
fi fi

View File

@@ -153,7 +153,7 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
AC_MSG_CHECKING(--with-developer-dir argument) AC_MSG_CHECKING(--with-developer-dir argument)
AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools], AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools],
DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR), DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
DEVELOPER_DIR=""; AC_MSG_RESULT(not present)) AC_MSG_RESULT(not present))
if test "x$DEVELOPER_DIR" = "x"; then if test "x$DEVELOPER_DIR" = "x"; then
AC_PATH_PROG(XCODE_SELECT, xcode-select) AC_PATH_PROG(XCODE_SELECT, xcode-select)

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
924,
/**/ /**/
923, 923,
/**/ /**/