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)

diff --git a/src/auto/configure b/src/auto/configure
index f2f34d90c6b2e69cede8da657fb890afac518ed8..1acf7da2e3bca94aa9a5f5301828f3abda3d91e9 100755 (executable)
--- 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 e558186adf21ef97fc026090eacffdcd4e38d19b..4f4b2fd4389d55b7cccea60cf24aabbafc8f60d4 100644 (file)
--- 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 edfbca8fee4bc688bf360827927fa3b132ec8d62..e3742cc9ea459f172bac4adbffa62b5c8e66c6b6 100644 (file)
--- 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,
 /**/