proper nesting of tests

sagemath · May 21, 2019 · 4f6434c · 4f6434c
1 parent 37fa1a1
commit 4f6434c
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/build/pkgs/flint/spkg-configure.m4 b/build/pkgs/flint/spkg-configure.m4
@@ -13,22 +13,24 @@ dnl Just part the options here
         *)
             AC_MSG_ERROR([allowed values for --with-flint are system and install]);;
     esac
-    
+   
     case "$with_flint" in
         system)
-               AC_CHECK_HEADER(flint/flint.h, [], [sage_spkg_install_flint=yes])
+               AC_CHECK_HEADER(flint/flint.h, [
           dnl fmpz_mat_is_hadamard appears in Flint 2.5.0
-               AC_SEARCH_LIBS([fmpz_mat_is_hadamard], [flint], [], [sage_spkg_install_flint=yes])
+                 AC_SEARCH_LIBS([fmpz_mat_is_hadamard], [flint], [
           dnl check that NTL is linked in
-               AC_SEARCH_LIBS([fmpz_poly_get_ZZX], [flint], [break], [sage_spkg_install_flint=yes])
-          dnl 
-               AC_MSG_CHECKING([that GC is not enabled in Flint... ])
-               AC_RUN_IFELSE([
-                  AC_LANG_PROGRAM([[#include <flint/flint.h>]], [[return HAVE_GC;]])],
-                  [AC_MSG_RESULT([GC not enabled. Good.])],
-		  [AC_MSG_RESULT([GC enabled. Incompatible with Sage.])
-		   sage_spkg_install_flint=yes])
+                   AC_SEARCH_LIBS([fmpz_poly_get_ZZX], [flint], [
 
+                     AC_MSG_CHECKING([that GC is not enabled in Flint... ])
+                     AC_RUN_IFELSE([
+                        AC_LANG_PROGRAM([[#include <flint/flint.h>]], [[return HAVE_GC;]])],
+                        [AC_MSG_RESULT([GC not enabled. Good.])],
+		        [AC_MSG_RESULT([GC enabled. Incompatible with Sage.])
+		         sage_spkg_install_flint=yes])
+                   ], [sage_spkg_install_flint=yes])
+                 ], [sage_spkg_install_flint=yes])
+               ], [sage_spkg_install_flint=yes])
             if test x$sage_spkg_install_flint = xyes; then
                AC_SUBST(SAGE_FLINT_PREFIX, ['$SAGE_LOCAL'])
                AC_MSG_RESULT([using Sage's flint SPKG])