Fail only if python2 components requested Fixes nmap#158

rapid7 · Jun 11, 2015 · bf22689 · bf22689
1 parent a19e3e5
commit bf22689
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/configure b/configure
@@ -5751,13 +5751,13 @@ else
   if test "$with_ndiff" = "check" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building Ndiff because Python 2.x with x>=4 was not found" >&5
 $as_echo "$as_me: WARNING: Not building Ndiff because Python 2.x with x>=4 was not found" >&2;}
-  else
+  elif test "$with_ndiff" = "yes"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "--with-ndiff requires Python 2.x with x>=4
 See \`config.log' for more details" "$LINENO" 5; }
   fi
-   with_ndiff=no
+  with_ndiff=no
 fi
 if test "$with_ndiff" = "no"; then
   BUILDNDIFF=""
@@ -5799,13 +5799,13 @@ else
   if test "$with_zenmap" = "check"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building Zenmap because Python 2.x with x>=4 was not found" >&5
 $as_echo "$as_me: WARNING: Not building Zenmap because Python 2.x with x>=4 was not found" >&2;}
-  else
+  elif test "$with_zenmap" = "yes"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "--with-zenmap requires Python 2.x with x>=4
 See \`config.log' for more details" "$LINENO" 5; }
   fi
-    with_zenmap=no
+  with_zenmap=no
 fi
 if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""

diff --git a/configure.ac b/configure.ac
@@ -231,10 +231,10 @@ if $HAVE_PYTHON2 ; then : ;
 else
   if test "$with_ndiff" = "check" ; then
     AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found])
-  else
+  elif test "$with_ndiff" = "yes"; then
     AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4])
   fi
-   with_ndiff=no
+  with_ndiff=no
 fi
 if test "$with_ndiff" = "no"; then
   BUILDNDIFF=""
@@ -268,10 +268,10 @@ if $HAVE_PYTHON2 ; then : ;
 else
   if test "$with_zenmap" = "check"; then
     AC_MSG_WARN([Not building Zenmap because Python 2.x with x>=4 was not found])
-  else
+  elif test "$with_zenmap" = "yes"; then
     AC_MSG_FAILURE([--with-zenmap requires Python 2.x with x>=4])
   fi
-    with_zenmap=no
+  with_zenmap=no
 fi
 if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""