commit 32d03b34ac8a34a962f57847fc431a2b4e14efea
author Bram Moolenaar <Bram@vim.org> Thu Nov 19 13:46:48 2015 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Nov 19 13:46:48 2015 +0100
tree 06b484b6b97ce3ba11ecb7ff9add7f63dc8ea27e
parent 6a2697ffd7e894861853b351689b0ddec8901c96

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

diff --git a/src/auto/configure b/src/auto/configure
index f2f34d9..1acf7da 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4198,7 +4198,7 @@
   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
 

src/configure.in

diff --git a/src/configure.in b/src/configure.in
index e558186..4f4b2fd 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -153,7 +153,7 @@
   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)

src/version.c

diff --git a/src/version.c b/src/version.c
index edfbca8..e3742cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    924,
+/**/
     923,
 /**/
     922,