Test for libitm directory present before testing for support.

From-SVN: r181179

diff --git a/ChangeLog b/ChangeLog
index 89eb37a6a4d5fe970a9f547034f59e024fb1dd6c..c25db94119fa0a38574ebe0dfacff38ba305e33e 100644 (file)
--- 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 7a7f2872bf766ebde48c5a18243bc6256b8a9edd..8a37411f686aa355cf4413731355eca0bfdc4805 100755 (executable)
--- 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 888d051433627a63828b8e7932d8d65d32aaaa0e..efabad4a224c483501d06e3cde0e1dbd7a34da58 100644 (file)
--- 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.