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

diff --git a/configure b/configure
index 26c90143995ca2d890cf00de46158e033a2d094d..b0d9ffe5fd7c425cb1b31963e0dc150d5c38e845 100755 (executable)
--- 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
 
 
 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
     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
             chmod +x bk-deps
         fi
     fi

diff --git a/configure.in b/configure.in
index 498ec14138091278ca469ee66b816cf9f2e00604..7d2de423587ddb7ca4f22d3c2e08d28a8886407b 100644 (file)
--- 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.
 
 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
     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
             chmod +x bk-deps
         fi
     fi