Skip to content

Commit 32d03b3

Browse files
committed
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)
1 parent 6a2697f commit 32d03b3

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4198,7 +4198,7 @@ if test "${with_developer_dir+set}" = set; then :
41984198
withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5
41994199
$as_echo "$DEVELOPER_DIR" >&6; }
42004200
else
4201-
DEVELOPER_DIR=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5
4201+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5
42024202
$as_echo "not present" >&6; }
42034203
fi
42044204

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
153153
AC_MSG_CHECKING(--with-developer-dir argument)
154154
AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools],
155155
DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
156-
DEVELOPER_DIR=""; AC_MSG_RESULT(not present))
156+
AC_MSG_RESULT(not present))
157157

158158
if test "x$DEVELOPER_DIR" = "x"; then
159159
AC_PATH_PROG(XCODE_SELECT, xcode-select)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
924,
744746
/**/
745747
923,
746748
/**/

0 commit comments

Comments
 (0)