Commit f407df43 authored by Leigh Stoller's avatar Leigh Stoller

Minor tweak to submodule check to allow elabinelab build.

parent c2169d3e
......@@ -7193,7 +7193,7 @@ fi
#
# Check for protogeni rspec.
#
if test "$PROTOGENI_SUPPORT" = "1" && test $ELABINELAB = "0"; then
if test "$PROTOGENI_SUPPORT" = "1" && test $ELABINELAB = "0" && -e "$srcdir/.git"; 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;};
......
......@@ -897,9 +897,9 @@ fi
#
# Check for protogeni rspec.
#
if test "$PROTOGENI_SUPPORT" = "1" && test $ELABINELAB = "0"; then
if test "$PROTOGENI_SUPPORT" = "1" && test $ELABINELAB = "0" && -e "$srcdir/.git"; then
if test ! -e "$srcdir/protogeni/rspec-geni/.git"; then
AC_MSG_WARN([protogeni/rspec-geni submodule not intialized yet]);
AC_MSG_WARN([protogeni/rspec-geni submodule not initialized yet]);
echo "Please cd into your source directory and run:"
echo " git submodule init"
echo " git submodule update"
......
......@@ -34,7 +34,7 @@ check-submodule:
false; \
fi
ifeq ($(ELABINELAB),0)
@if [ ! -e "$(RSPECGENI)" ]; then \
@if [ -e "$(SRCDIR)/.git" -a ! -e "$(RSPECGENI)" ]; then \
echo '*** rspec-geni has not been updated; you need to reconfigure!'; \
false; \
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment