From 5b8479e8092b39f0c9e7b9170a83f6242fedcefa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Feb 2014 14:12:15 +0000 Subject: [PATCH] Fix build under OS X with --disable-xrc. Don't try to change the install names in non-existent (in this case) wxrc. Closes #15946. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 5 ++++- configure.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dde0fd5efe..8b1ee814ec 100755 --- a/configure +++ b/configure @@ -29186,8 +29186,11 @@ done for i in \${libnames} ; do ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} done -${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} 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 diff --git a/configure.in b/configure.in index 7ecb037249..2634551717 100644 --- a/configure.in +++ b/configure.in @@ -3786,8 +3786,11 @@ done for i in \${libnames} ; do ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} done -${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} 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