Tweak protogeni makefile and configure to watch for missing

rspec-emulab directory (needs reconfigure) and missing rspec-geni
directory (needs git submodule init/update).

configure

@@ -7135,6 +7135,21 @@ if test "$TBMAINSITE" = 1; then
     FANCYBANNER=1
 fi
 
+#
+# Check for protogeni rspec.
+#
+if test "$PROTOGENI_SUPPORT" = "1"; then
+   if test ! -e "$srcdir/protogeni/rspec-geni/.git"; then
+	{ $as_echo "$as_me:$LINENO: WARNING: protogeni/rspec-geni submodule not intialized yet" >&5
+$as_echo "$as_me: WARNING: protogeni/rspec-geni submodule not intialized yet" >&2;};
+	echo "Please cd into your source directory and run:"
+	echo "    git submodule init"
+	echo "    git submodule update"
+	echo "Then rerun configure"
+	exit 1;
+   fi
+fi
+
 #
 # Merge build
 #

configure.in

@@ -856,6 +856,20 @@ if test "$TBMAINSITE" = 1; then
     FANCYBANNER=1
 fi
 
+#
+# Check for protogeni rspec.
+#
+if test "$PROTOGENI_SUPPORT" = "1"; then
+   if test ! -e "$srcdir/protogeni/rspec-geni/.git"; then
+	AC_MSG_WARN([protogeni/rspec-geni submodule not intialized yet]);
+	echo "Please cd into your source directory and run:"
+	echo "    git submodule init"
+	echo "    git submodule update"
+	echo "Then rerun configure in your object tree"
+	exit 1;
+   fi
+fi
+
 #
 # Merge build
 #

protogeni/GNUmakefile.in

@@ -8,12 +8,13 @@ SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
 OBJDIR		= ..
 SUBDIR		= protogeni
+RSPECGENI       = $(SRCDIR)/rspec-geni/.git
 
 include $(OBJDIR)/Makeconf
 
 SUBDIRS	= security xmlrpc lib scripts etc rspec-emulab
 
-all:	all-subdirs
+all:	check-submodule all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
@@ -26,6 +27,16 @@ install:
 	@$(MAKE) -C rspec-emulab install
 	@$(MAKE) -C test install
 
+check-submodule:
+	@if [ ! -e "rspec-emulab" ]; then \
+	    echo '*** rspec-emulab does not exist; you need to reconfigure!'; \
+	    false; \
+	fi
+	@if [ ! -e "$(RSPECGENI)" ]; then \
+	    echo '*** rspec-geni has not been updated; you need to reconfigure!'; \
+	    false; \
+	fi
+
 install-genischemacheck:
 	@$(MAKE) -C lib install-genischemacheck