From 873194f845538b1e058ccf6fb3c9b5e729dfebd9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 Aug 2013 11:15:53 +0000 Subject: [PATCH] Only patch bk-deps in configure if dependency tracking is used. Otherwise we get (harmless) errors when trying to patch a non-existent file. See #15454. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 4 ++-- configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 26c9014399..b0d9ffe5fd 100755 --- a/configure +++ b/configure @@ -41275,11 +41275,11 @@ $as_echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1 fi -if test "$wxUSE_MAC" = 1 ; then +if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$disable_macosx_deps" = "xyes"; then sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp - mv temp bk-deps + mv temp bk-deps chmod +x bk-deps fi fi diff --git a/configure.in b/configure.in index 498ec14138..7d2de42358 100644 --- a/configure.in +++ b/configure.in @@ -8199,11 +8199,11 @@ dnl when we've configured a Universal binary build. dnl The next version of Bakefile will have the correct fix for this dnl at which time, this hack can be removed. -if test "$wxUSE_MAC" = 1 ; then +if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$disable_macosx_deps" = "xyes"; then sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp - mv temp bk-deps + mv temp bk-deps chmod +x bk-deps fi fi -- 2.45.2