Move computation of SAGE_OPTIONAL_{INSTALLED,CLEANED}_PACKAGES to sage_spkg_collect.m4

Author: Matthias Koeppe

m4/sage_spkg_collect.m4

@@ -105,10 +105,10 @@ SAGE_BUILT_PACKAGES=''
 # underlying system.
 SAGE_DUMMY_PACKAGES=''
 
-# List of currently installed and to-be-installed optional packages - filled in SAGE_SPKG_ENABLE
-#SAGE_OPTIONAL_INSTALLED_PACKAGES
-# List of optional packages to be uninstalled - filled in SAGE_SPKG_ENABLE
-#SAGE_OPTIONAL_CLEANED_PACKAGES
+# List of currently installed and to-be-installed standard/optional/experimental packages
+SAGE_OPTIONAL_INSTALLED_PACKAGES=''
+# List of optional packages to be uninstalled
+SAGE_OPTIONAL_CLEANED_PACKAGES=''
 
 # List of all packages that should be downloaded
 SAGE_SDIST_PACKAGES=''
@@ -286,6 +286,22 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
         SAGE_SDIST_PACKAGES="${SAGE_SDIST_PACKAGES} \\$(printf '\n    ')${SPKG_NAME}"
     fi
 
+    # Determine whether package is enabled
+    AS_VAR_SET([is_installed], [no])
+    for f in "$SAGE_SPKG_INST/${SPKG_NAME}"-*; do
+        AS_IF([test -r "$f"],
+              [AS_VAR_SET([is_installed], [yes])])
+    done
+
+    AS_VAR_IF([SAGE_ENABLE_${SPKG_NAME}}], [if_installed],
+          [AS_VAR_SET([SAGE_ENABLE_${SPKG_NAME}], $is_installed)])
+    AS_VAR_COPY([want_spkg], [SAGE_ENABLE_${SPKG_NAME}])
+
+    spkg_line=" \\$(printf '\n    ')$SPKG_NAME"
+    AS_CASE([$is_installed-$want_spkg],
+            [*-yes],  [AS_VAR_APPEND(SAGE_OPTIONAL_INSTALLED_PACKAGES, "$spkg_line")],
+            [yes-no], [AS_VAR_APPEND(SAGE_OPTIONAL_CLEANED_PACKAGES, "$spkg_line")])
+
     # Determine package dependencies
     #
     DEP_FILE="$DIR/dependencies"

m4/sage_spkg_enable.m4

@@ -1,14 +1,13 @@
-AC_DEFUN([SAGE_SPKG_ENABLE], [
-  m4_pushdef([SPKG_NAME], [$1])
-  m4_pushdef([SPKG_TYPE], [$2])
+AC_DEFUN([SAGE_SPKG_ENABLE], [dnl
+  m4_pushdef([SPKG_NAME], [$1])dnl
+  m4_pushdef([SPKG_TYPE], [$2])dnl
   m4_if(SPKG_TYPE, [standard], [
     dnl standard packages; help message is deliberately very brief,
     dnl as this is for advanced users only
     AC_ARG_ENABLE(SPKG_NAME,
       AS_HELP_STRING([--disable-]SPKG_NAME,
                      [disable $2 package ]SPKG_NAME),
-      AS_VAR_SET(want_spkg, [$enableval]),
-      AS_VAR_SET(want_spkg, [yes])
+      AS_VAR_SET([SAGE_ENABLE_]SPKG_NAME, [$enableval])
     )
   ], [
     dnl optional/experimental packages
@@ -18,26 +17,9 @@ AC_DEFUN([SAGE_SPKG_ENABLE], [
 AS_HELP_STRING([], [package information: ./sage -info ]SPKG_NAME)
 AS_HELP_STRING([--disable-]SPKG_NAME,
                      [disable build and uninstall if previously installed by Sage in PREFIX; same as --enable-]SPKG_NAME[=no]),
-      AS_VAR_SET(want_spkg, [$enableval]),
-      AS_VAR_SET(want_spkg, [if_installed])
+      AS_VAR_SET([SAGE_ENABLE_]SPKG_NAME, [$enableval])
     )
-  ])
-
-  AS_VAR_SET([is_installed], [no])
-  for f in "$SAGE_SPKG_INST/SPKG_NAME"-*; do
-      AS_IF([test -r "$f"],
-            [AS_VAR_SET([is_installed], [yes])])
-  done
-
-  AS_IF([test "$want_spkg" = if_installed],
-        [AS_VAR_SET([want_spkg], $is_installed)])
-
-  spkg_line=" \\$(printf '\n    ')SPKG_NAME"
-  AS_CASE([$is_installed-$want_spkg],
-          [*-yes],  [AS_VAR_APPEND(SAGE_OPTIONAL_INSTALLED_PACKAGES, "$spkg_line")],
-          [yes-no], [AS_VAR_APPEND(SAGE_OPTIONAL_CLEANED_PACKAGES, "$spkg_line")])
-  AS_VAR_SET([SAGE_ENABLE_]SPKG_NAME, [$want_spkg])
-  AC_SUBST([SAGE_ENABLE_]SPKG_NAME)
-  m4_popdef([SPKG_TYPE])
-  m4_popdef([SPKG_NAME])
+  ])dnl
+  m4_popdef([SPKG_TYPE])dnl
+  m4_popdef([SPKG_NAME])dnl
 ])