remove SAGE_HAVE_OPENMP

Author: Jonathan Kliem

build/pkgs/gcc/spkg-configure.m4

@@ -227,11 +227,9 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
         AX_OPENMP([
             AC_SUBST(OPENMP_CFLAGS)
             AC_SUBST(OPENMP_CXXFLAGS)
-            SAGE_HAVE_OPENMP=yes
         ])
         AC_LANG_POP()
     ])
-    AC_SUBST(SAGE_HAVE_OPENMP)
     AC_LANG_POP()
 
 

build/pkgs/python3/spkg-configure.m4

@@ -98,13 +98,14 @@ SAGE_SPKG_CONFIGURE([python3], [
             ])
         ])
 
-        AS_IF([test -n "$SAGE_HAVE_OPENMP"], [
+        AS_IF([test -n "$OPENMP_CFLAGS"], [
             AC_MSG_CHECKING([whether OpenMP works with the C/C++ compilers configured for building extensions for $PYTHON_FOR_VENV])
             SAGE_PYTHON_CHECK_DISTUTILS([CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS $OPENMP_CFLAGS" CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" conftest_venv/bin/python3], [
                 AC_MSG_RESULT([yes])
             ], [
                 AC_MSG_RESULT([no, $reason; disabling use OpenMP])
-                SAGE_HAVE_OPENMP=""
+                OPENMP_CFLAGS=""
+                OPENMP_CXXFLAGS=""
             ])
         ])
 

src/bin/sage-env-config.in

@@ -47,12 +47,8 @@ CONFIGURED_OBJCXX="@OBJCXX@"
 # Other configuration (exported)
 #######################################
 # OpenMP flags, if available.
-export SAGE_HAVE_OPENMP="@SAGE_HAVE_OPENMP@"
-if [ -n "$SAGE_HAVE_OPENMP" ]; then
-    export SAGE_OPENMP_CFLAGS="@OPENMP_CFLAGS@"
-    export SAGE_OPENMP_CXXFLAGS="@OPENMP_CXXFLAGS@"
-fi
-
+export SAGE_OPENMP_CFLAGS="@OPENMP_CFLAGS@"
+export SAGE_OPENMP_CXXFLAGS="@OPENMP_CXXFLAGS@"
 
 #######################################
 # Other configuration (not exported, only used in sage-env)