45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
Index: configure
|
||
|
|
===================================================================
|
||
|
|
--- configure (revision 77757)
|
||
|
|
+++ configure (working copy)
|
||
|
|
@@ -29176,7 +29176,7 @@
|
||
|
|
*-*-darwin* )
|
||
|
|
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
|
||
|
|
if test "$install_name_tool" -a -x "$install_name_tool"; then
|
||
|
|
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
|
||
|
|
+ DYLIB_RPATH_POSTLINK=""
|
||
|
|
cat <<EOF >change-install-names
|
||
|
|
#!/bin/sh
|
||
|
|
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
|
||
|
|
@@ -29189,7 +29189,7 @@
|
||
|
|
done
|
||
|
|
EOF
|
||
|
|
chmod +x change-install-names
|
||
|
|
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
|
||
|
|
+ DYLIB_RPATH_INSTALL=""
|
||
|
|
fi
|
||
|
|
|
||
|
|
HEADER_PAD_OPTION="-headerpad_max_install_names"
|
||
|
|
Index: configure.in
|
||
|
|
===================================================================
|
||
|
|
--- configure.in (revision 77757)
|
||
|
|
+++ configure.in (working copy)
|
||
|
|
@@ -3772,7 +3772,7 @@
|
||
|
|
*-*-darwin* )
|
||
|
|
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
|
||
|
|
if test "$install_name_tool" -a -x "$install_name_tool"; then
|
||
|
|
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
|
||
|
|
+ DYLIB_RPATH_POSTLINK=""
|
||
|
|
cat <<EOF >change-install-names
|
||
|
|
#!/bin/sh
|
||
|
|
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
|
||
|
|
@@ -3785,7 +3785,7 @@
|
||
|
|
done
|
||
|
|
EOF
|
||
|
|
chmod +x change-install-names
|
||
|
|
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
|
||
|
|
+ DYLIB_RPATH_INSTALL=""
|
||
|
|
fi
|
||
|
|
|
||
|
|
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
|