Test for libitm directory present before testing for support.

From-SVN: r181179
This commit is contained in:
Richard Henderson 2011-11-08 13:18:26 -08:00 committed by Richard Henderson
parent 86fc3d06b0
commit e948157df8
3 changed files with 30 additions and 22 deletions

View file

@ -1,5 +1,7 @@
2011-11-08 Richard Henderson <rth@redhat.com> 2011-11-08 Richard Henderson <rth@redhat.com>
* configure.ac: Test for libitm directory present first.
* configure.ac: Adjust srcdir for running libitm/configure.tgt. * configure.ac: Adjust srcdir for running libitm/configure.tgt.
* configure.ac: Test libitm/configure.tgt to disable libitm. * configure.ac: Test libitm/configure.tgt to disable libitm.

25
configure vendored
View file

@ -3057,20 +3057,23 @@ if test x$enable_libgomp = x ; then
esac esac
fi fi
# Disable libitm on unsupported hosted systems. # Disable libitm on unsupported systems.
if test x$enable_libitm = x; then if test -d ${srcdir}/libitm; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5 if test x$enable_libitm = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
$as_echo_n "checking for libitm support... " >&6; } $as_echo_n "checking for libitm support... " >&6; }
if (srcdir=${srcdir}/libitm; \ if (srcdir=${srcdir}/libitm; \
. ${srcdir}/configure.tgt; \ . ${srcdir}/configure.tgt; \
test -n "$UNSUPPORTED"); then test -n "$UNSUPPORTED")
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
noconfigdirs="$noconfigdirs target-libitm" noconfigdirs="$noconfigdirs target-libitm"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
fi fi
fi
fi fi
# Disable libssp for some systems. # Disable libssp for some systems.

View file

@ -493,17 +493,20 @@ if test x$enable_libgomp = x ; then
esac esac
fi fi
# Disable libitm on unsupported hosted systems. # Disable libitm on unsupported systems.
if test x$enable_libitm = x; then if test -d ${srcdir}/libitm; then
AC_MSG_CHECKING([for libitm support]) if test x$enable_libitm = x; then
if (srcdir=${srcdir}/libitm; \ AC_MSG_CHECKING([for libitm support])
. ${srcdir}/configure.tgt; \ if (srcdir=${srcdir}/libitm; \
test -n "$UNSUPPORTED"); then . ${srcdir}/configure.tgt; \
AC_MSG_RESULT([no]) test -n "$UNSUPPORTED")
noconfigdirs="$noconfigdirs target-libitm" then
else AC_MSG_RESULT([no])
AC_MSG_RESULT([yes]) noconfigdirs="$noconfigdirs target-libitm"
fi else
AC_MSG_RESULT([yes])
fi
fi
fi fi
# Disable libssp for some systems. # Disable libssp for some systems.