sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r25179: fix libunwind detection on x86 based hosts

Browse Source 
we need -lunwind-x86 not -lunwind-i686

metze
(This used to be commit 2e5f4781652961d6369a64c48b92697c11262c51)
This commit is contained in:
Stefan Metzmacher 2007-09-15 19:14:49 +00:00 committed by Gerald (Jerry) Carter
parent 6e4bf4c188
commit f82eb0fef6
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/configure.in
View File

@ -702,6 +702,10 @@ UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
AC_MSG_CHECKING(uname -p)
AC_MSG_RESULT(${UNAME_P})
UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
AC_MSG_CHECKING(uname -i)
AC_MSG_RESULT(${UNAME_I})
dnl Add #include for broken IRIX header files
case "$host_os" in
*irix6*)
@ -1401,15 +1405,33 @@ LIBS="$save_LIBS"
# any of them.
AC_MSG_CHECKING([for libunwind])
save_LIBS=$LIBS
if test x"$UNAME_P" = xunknown ; then
# This probably won't link without the platform-specific libunwind.
LIBS="$LIBS -lunwind"
else
# Add the platform-specific libunwind module. uname -p seems the most
# plausible option and works for ia64, where libunwind is most useful.
LIBS="$LIBS -lunwind -lunwind-$UNAME_P"
UNWIND_ARCH="unknown"
if test x"$UNAME_I" != x"unknown"; then
UNWIND_ARCH="$UNAME_I"
elif test x"$UNAME_M" != x"unknown"; then
UNWIND_ARCH="$UNAME_M"
elif test x"$UNAME_P" != x"unknown"; then
UNWIND_ARCH="$UNAME_P"
fi
case "$UNWIND_ARCH" in
unknown)
# This probably won't link without
# the platform-specific libunwind.
LIBS="$LIBS -lunwind"
;;
i386|i586|i686)
# Add the platform-specific libunwind module.
LIBS="$LIBS -lunwind -lunwind-x86"
;;
*)
# Add the platform-specific libunwind module.
# based on uname -i, uname -m or uname -p
LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
;;
esac
AC_TRY_LINK(
[
#ifdef HAVE_LIBUNWIND_H