From 95b16f247478a8ed8687779e541c214f03e0ecc6 Mon Sep 17 00:00:00 2001
From: Daniel Povey <dpovey@gmail.com>
Date: Mon, 19 Nov 2018 22:21:25 -0500
Subject: [PATCH] [build] Clarify instructions if cub is not found

---
 src/configure | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/configure b/src/configure
index cbb887e4de6..c4a1445efbd 100755
--- a/src/configure
+++ b/src/configure
@@ -1096,13 +1096,6 @@ if $double_precision; then
 else
   echo "DOUBLE_PRECISION = 0" >> kaldi.mk
 fi
-$use_cuda && echo "Checking cub library in $CUBROOT ..."
-if [[ "$use_cuda" = true  && ! -f $CUBROOT/cub/cub.cuh ]]; then
-  failure "Could not find file $CUBROOT/cub/cub.cuh:
-  you may not have installed cub. See ../tools/INSTALL"
-else
-  echo "CUBROOT = $CUBROOT" >> kaldi.mk
-fi
 echo "Checking OpenFst library in $FSTROOT ..."
 if [ ! -f $FSTROOT/include/fst/fst.h  ]; then
   failure "Could not find file $FSTROOT/include/fst/fst.h:
@@ -1135,6 +1128,16 @@ echo "OPENFSTLIBS = $OPENFSTLIBS" >> kaldi.mk
 echo "OPENFSTLDFLAGS = $OPENFSTLDFLAGS" >> kaldi.mk
 echo >> kaldi.mk
 
+$use_cuda && echo "Checking cub library in $CUBROOT ..."
+if [[ "$use_cuda" = true  && ! -f $CUBROOT/cub/cub.cuh ]]; then
+  failure "Could not find file $CUBROOT/cub/cub.cuh:
+  you may not have installed cub.  Go to ../tools/ and type
+  e.g. 'make cub'; cub is a new requirement."
+else
+  echo "CUBROOT = $CUBROOT" >> kaldi.mk
+fi
+
+
 # OS-specific steps given below append to kaldi.mk
 echo "Doing OS specific configurations ..."
 
@@ -1347,7 +1350,7 @@ elif [ "`uname`" == "Linux" ]; then
     elif [ -f $OPENBLASROOT/include/openblas/cblas.h ] ; then
       # in REDHAT/CentOS/Ubuntu package installs, the includes are located here
       OPENBLASINCDIR=$OPENBLASROOT/include/openblas
-    else 
+    else
       echo "$0: ***** Using OpenBlas from $OPENBLASROOT but cblas.h is not found. "
       echo " ****** Assuming openblas is aleady in a default include path, but"
       echo " ***** if you get compilation messages about not finding files like cblas.h,"