]> git.saurik.com Git - wxWidgets.git/commitdiff
No install_name_tool on OS X 10.1
authorMichael Wetherell <mike.wetherell@ntlworld.com>
Thu, 26 May 2005 16:48:32 +0000 (16:48 +0000)
committerMichael Wetherell <mike.wetherell@ntlworld.com>
Thu, 26 May 2005 16:48:32 +0000 (16:48 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure
configure.in

index 4a11e99030102743222f0812892c5099810cbfc3..28d11f43fd9af6ae7a1adaaa8fb2d4e3bb9a22de 100755 (executable)
--- 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 <<EOF >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 <<EOF >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* )
index c7ca99790b8d54907c332ff81c0ecf52c72764c8..b6ed6dbe9a7eec0942aceef61efebfcf2c1e546a 100644 (file)
@@ -3551,8 +3551,10 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
       
       powerpc-*-darwin* )
-        SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
-        cat <<EOF >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 <<EOF >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* )