From: Michael Wetherell Date: Thu, 26 May 2005 16:48:32 +0000 (+0000) Subject: No install_name_tool on OS X 10.1 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0caebc27b4d455b108842cca1b4e304e4fd72d72?ds=inline No install_name_tool on OS X 10.1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index 4a11e99030..28d11f43fd 100755 --- a/configure +++ b/configure @@ -29901,8 +29901,10 @@ rm -f conftest.err conftest.$ac_objext \ ;; powerpc-*-darwin* ) - SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" - cat <change-install-names + install_name_tool=`which install_name_tool` + if test "$install_name_tool" -a -x "$install_name_tool"; then + SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + cat <change-install-names #!/bin/sh libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` inst_cmd="install_name_tool " @@ -29911,7 +29913,8 @@ for i in \${libnames} ; do done \${inst_cmd} \${3} EOF - chmod +x change-install-names + chmod +x change-install-names + fi ;; *-*-cygwin* | *-*-mingw32* ) diff --git a/configure.in b/configure.in index c7ca99790b..b6ed6dbe9a 100644 --- a/configure.in +++ b/configure.in @@ -3551,8 +3551,10 @@ if test "$wxUSE_SHARED" = "yes"; then ;; powerpc-*-darwin* ) - SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" - cat <change-install-names + install_name_tool=`which install_name_tool` + if test "$install_name_tool" -a -x "$install_name_tool"; then + SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + cat <change-install-names #!/bin/sh libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` inst_cmd="install_name_tool " @@ -3561,7 +3563,8 @@ for i in \${libnames} ; do done \${inst_cmd} \${3} EOF - chmod +x change-install-names + chmod +x change-install-names + fi ;; *-*-cygwin* | *-*-mingw32* )