From a73ce1c90ea342d0eea9b9c63b644b7d89df6d96 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Mar 2014 15:49:58 +0000
Subject: [PATCH] Really fix using install_name_tool with wxrc under OS X.

Don't test for USE_XRC before it is set, correcting the wrong change of
r75845.

See #15946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 6 ++----
 configure.in | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 23325d68c6..1b4e3ca7ce 100755
--- a/configure
+++ b/configure
@@ -29188,10 +29188,6 @@ for i in \${libnames} ; do
     ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
 done
 EOF
-            if test $USE_XRC = 1; then
-                echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
-            fi
-
             chmod +x change-install-names
             DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
         fi
@@ -36546,6 +36542,8 @@ $as_echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;}
 
         USE_XRC=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+
+        echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
     fi
 fi
 
diff --git a/configure.in b/configure.in
index e791f75cbe..d2bb7f8306 100644
--- a/configure.in
+++ b/configure.in
@@ -3784,10 +3784,6 @@ for i in \${libnames} ; do
     ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
 done
 EOF
-            if test $USE_XRC = 1; then
-                echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
-            fi
-
             chmod +x change-install-names
             DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
         fi
@@ -7150,6 +7146,8 @@ if test "$wxUSE_XRC" = "yes"; then
         AC_DEFINE(wxUSE_XRC)
         USE_XRC=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+
+        echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
     fi
 fi