correct the use of AC_CHECK_HEADERS

sagemath · Apr 29, 2020 · e0d812f · e0d812f
1 parent 45d6d07
commit e0d812f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/build/pkgs/suitesparse/spkg-configure.m4 b/build/pkgs/suitesparse/spkg-configure.m4
@@ -3,12 +3,10 @@ SAGE_SPKG_CONFIGURE([suitesparse], [
         AC_SEARCH_LIBS([cholmod_speye], [cholmod], [
          AC_SEARCH_LIBS([umfpack_di_solve], [umfpack], [
           AC_SEARCH_LIBS([SuiteSparse_version], [suitesparseconfig], [
-            AC_CHECK_HEADERS([SuiteSparse_config.h amd.h],
-                             [suispa_header_found=yes])
-            AC_CHECK_HEADERS([suitesparse/SuiteSparse_config.h suitesparse/amd.h],
-                             [suispa_header_found=yes])
-            AS_IF([test x$suispa_header_found = xyes], [],
-                 [sage_spkg_install_suitesparse=yes])
+            AC_CHECK_HEADERS([suitesparse/SuiteSparse_config.h SuiteSparse_config.h], [
+               AC_CHECK_HEADERS([suitesparse/amd.h amd.h], [sage_spkg_install_suitesparse=no; break], [sage_spkg_install_suitesparse=yes])
+               break
+               ], [sage_spkg_install_suitesparse=yes])
           ], [sage_spkg_install_suitesparse=yes])
          ], [
          sage_spkg_install_suitesparse=yes])