diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | configure | 27 | ||||
| -rw-r--r-- | configure.ac | 25 |
3 files changed, 31 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index 89eb37a6a4d..c25db94119f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/configure b/configure index 7a7f2872bf7..8a37411f686 100755 --- a/configure +++ b/configure @@ -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 888d0514336..efabad4a224 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. |