use -R instead of -Wl,-rpath with Sun CC under Linux too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-22 17:23:54 +00:00
parent e3b13be45a
commit ab595566b1

View File

@@ -4132,6 +4132,11 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl use versioned symbols if available on the platform
WX_VERSIONED_SYMBOLS([\$(wx_top_builddir)/version-script])
dnl test for Sun CC which can be used under both Solaris and Linux
if test "x$SUNCXX" = xyes; then
SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
WXCONFIG_RPATH="-R\$libdir"
else
case "${host}" in
*-*-linux* | *-*-gnu* )
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
@@ -4139,7 +4144,9 @@ if test "$wxUSE_SHARED" = "yes"; then
;;
*-*-solaris2* )
if test "$GCC" = yes ; then
dnl here we know that Sun CC is not used as we tested for it above,
dnl hence we must be using gcc
dnl newer versions of gcc need -isystem to compile X headers on
dnl Solaris (which use old style C syntax)
CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
@@ -4170,10 +4177,6 @@ if test "$wxUSE_SHARED" = "yes"; then
])
])
LDFLAGS="$saveLdflags"
else
SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
WXCONFIG_RPATH="-R\$libdir"
fi
;;
*-*-darwin* )
@@ -4205,6 +4208,7 @@ EOF
;;
esac
fi
if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG=''
@@ -5262,6 +5266,10 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
dnl wouldn't be found by it
AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup,
[
dnl C compiler may treat pthread_cleanup_push() as an undeclared
dnl function and not give a warning even if it's unavailable, so use
dnl the C++ one for this test
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <pthread.h>
void ThreadCleanupFunc(void *p);
],
@@ -5275,6 +5283,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
wx_cv_func_pthread_cleanup=no
]
)
AC_LANG_POP()
])
if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)