diff options
| author | Richard Henderson <rth@redhat.com> | 2011-11-08 13:18:26 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2011-11-08 13:18:26 -0800 |
| commit | e948157df85d8bfbb9302263227dab1ff8d9ba74 (patch) | |
| tree | 0bff03ed84c4fe244e59b64d21af8f00e91bf32b | |
| parent | 86fc3d06b086930c41fa9fa1be82a0fa92699a12 (diff) | |
| download | gcc-e948157df85d8bfbb9302263227dab1ff8d9ba74.zip gcc-e948157df85d8bfbb9302263227dab1ff8d9ba74.tar.gz gcc-e948157df85d8bfbb9302263227dab1ff8d9ba74.tar.bz2 | |
Test for libitm directory present before testing for support.
From-SVN: r181179
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | configure | 27 | ||||
| -rw-r--r-- | configure.ac | 25 |
3 files changed, 31 insertions, 23 deletions
@@ -1,5 +1,7 @@ 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: Test libitm/configure.tgt to disable libitm. @@ -3057,20 +3057,23 @@ if test x$enable_libgomp = x ; then esac fi -# Disable libitm on unsupported hosted systems. -if test x$enable_libitm = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5 +# Disable libitm on unsupported systems. +if test -d ${srcdir}/libitm; then + 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; } - if (srcdir=${srcdir}/libitm; \ - . ${srcdir}/configure.tgt; \ - test -n "$UNSUPPORTED"); then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - noconfigdirs="$noconfigdirs target-libitm" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if (srcdir=${srcdir}/libitm; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + noconfigdirs="$noconfigdirs target-libitm" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - fi + fi + fi fi # Disable libssp for some systems. diff --git a/configure.ac b/configure.ac index 888d051..efabad4 100644 --- a/configure.ac +++ b/configure.ac @@ -493,17 +493,20 @@ if test x$enable_libgomp = x ; then esac fi -# Disable libitm on unsupported hosted systems. -if test x$enable_libitm = x; then - AC_MSG_CHECKING([for libitm support]) - if (srcdir=${srcdir}/libitm; \ - . ${srcdir}/configure.tgt; \ - test -n "$UNSUPPORTED"); then - AC_MSG_RESULT([no]) - noconfigdirs="$noconfigdirs target-libitm" - else - AC_MSG_RESULT([yes]) - fi +# Disable libitm on unsupported systems. +if test -d ${srcdir}/libitm; then + if test x$enable_libitm = x; then + AC_MSG_CHECKING([for libitm support]) + if (srcdir=${srcdir}/libitm; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libitm" + else + AC_MSG_RESULT([yes]) + fi + fi fi # Disable libssp for some systems. |