From bd48077584f218f563d52e27a78db8c1527a7d8c Mon Sep 17 00:00:00 2001
From: Jordan Rose <jordan_rose@apple.com>
Date: Thu, 22 Aug 2013 15:49:53 +0000
Subject: [PATCH] Autoconf: The Clang ARC migrator now depends on the static
 analyzer.

I don't actually have a version of autoconf so I edited configure directly
as well. It's copy-pasted so I think there was little margin for error.

See also Clang-side dependency graph changes.

llvm-svn: 189026
---
 autoconf/configure.ac |  7 ++++++-
 configure             | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 31edd35792b..993e41ced96 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -551,7 +551,12 @@ AC_ARG_ENABLE(clang-static-analyzer,
                              enableval="yes")
 case "$enableval" in
   yes) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]) ;;
-  no)  AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) ;;
+  no)  
+    if test ${clang_arcmt} != "no" ; then
+      AC_MSG_ERROR([Cannot enable clang ARC Migration Tool while disabling static analyzer.])
+    fi
+    AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) 
+    ;;
   default) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]);;
   *) AC_MSG_ERROR([Invalid setting for --enable-clang-static-analyzer. Use "yes" or "no"]) ;;
 esac
diff --git a/configure b/configure
index 739b150938e..d6d62ea3a26 100755
--- a/configure
+++ b/configure
@@ -5224,8 +5224,14 @@ fi
 case "$enableval" in
   yes) ENABLE_CLANG_STATIC_ANALYZER=1
  ;;
-  no)  ENABLE_CLANG_STATIC_ANALYZER=0
- ;;
+  no)
+    if test ${clang_arcmt} != "no" ; then
+      { { echo "$as_me:$LINENO: error: Cannot enable clang ARC Migration Tool while disabling static analyzer." >&5
+echo "$as_me: error: Cannot enable clang ARC Migration Tool while disabling static analyzer." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    ENABLE_CLANG_STATIC_ANALYZER=0
+    ;;
   default) ENABLE_CLANG_STATIC_ANALYZER=1
 ;;
   *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-clang-static-analyzer. Use \"yes\" or \"no\"" >&5