From 32d03b34ac8a34a962f57847fc431a2b4e14efea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 19 Nov 2015 13:46:48 +0100 Subject: [PATCH] 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) --- src/auto/configure | 2 +- src/configure.in | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index f2f34d90c6..1acf7da2e3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -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 $as_echo "$DEVELOPER_DIR" >&6; } 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; } fi diff --git a/src/configure.in b/src/configure.in index e558186adf..4f4b2fd438 100644 --- a/src/configure.in +++ b/src/configure.in @@ -153,7 +153,7 @@ if test "`(uname) 2>/dev/null`" = Darwin; then AC_MSG_CHECKING(--with-developer-dir argument) 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=""; AC_MSG_RESULT(not present)) + AC_MSG_RESULT(not present)) if test "x$DEVELOPER_DIR" = "x"; then AC_PATH_PROG(XCODE_SELECT, xcode-select) diff --git a/src/version.c b/src/version.c index edfbca8fee..e3742cc9ea 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 924, /**/ 923, /**/