Merge changes from github.

Change: 123427036

1 files changed, 0 insertions, 11 deletions

diff --git a/configure b/configure
index 5d6397da57..98048ba91d 100755
--- a/configure
+++ b/configure
@@ -2,17 +2,6 @@
 
 DO_NOT_SUBMIT_WARNING="Unofficial setting. DO NOT SUBMIT!!!"
 
-## Verify that the submodule google/protobuf is available
-# TODO(cais): Remove this check once protobuf is no longer depended upon
-if [[ ! -f "google/protobuf/protobuf.bzl" ]]; then
-  echo "ERROR: It appears that the required submodule google/protobuf is not "\
-"available in this TensorFlow git clone."
-  echo "Please be sure to use the --recurse-submodules flag when performing "\
-"git clone of TensorFlow."
-
-  exit 1
-fi
-
 ## Set up python-related environment settings
 while true; do
   fromuser=""