On 11/08/2011 09:56 AM, Pedro Alves wrote:
> On Tuesday 08 November 2011 17:31:45, Richard Henderson wrote:
>> On 11/08/2011 09:26 AM, Pedro Alves wrote:
>>> On Tuesday 08 November 2011 16:33:52, Richard Henderson wrote:
>>>> toplevel/
>>>> * configure.ac: Adjust srcdir for running libitm/configure.tgt.
>>>
>>>> +# 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; \
>>>
>>> This should check that libitm exists before sourcing the script,
>>> as otherwise it will error out on src tree
>>> checkouts (binutils, gdb, ...), given that the libitm directory
>>> doesn't exist there.
>>
>> Should I bother with an explicit test, or just use "set -e"?
>
> Whatever works is fine with me. :-)
>
Tested and committed the following.
r~
diff --git a/ChangeLog b/ChangeLog
index 89eb37a..c25db94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-11-08 Richard Henderson <[email protected]>
+ * 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 7a7f287..8a37411 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 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.
