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
This commit is contained in:
6
configure
vendored
6
configure
vendored
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user