make info (and makeinfo) standard, simplify scripts for ecl and maxima

sagemath · May 8, 2023 · b202325 · b202325
1 parent 6d0ca56
commit b202325
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/build/pkgs/ecl/dependencies b/build/pkgs/ecl/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline gc libffi
+$(MP_LIBRARY) readline gc libffi info
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ecl/spkg-install.in b/build/pkgs/ecl/spkg-install.in
@@ -31,18 +31,6 @@ cp "$SAGE_ROOT"/config/config.* src
 
 if [ x"$SAGE_SPKG_INSTALL_DOCS" != xyes ] ; then
     ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-else
-    # ECL 2020 needs modern makeinfo
-    command -v texi2any >/dev/null 2>&1
-    if [ $? -ne 0 ]; then # texi2any not found -> makeinfo too old, if present
-        ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-    else
-        if makeinfo -c foo 2>&1 | grep -q invalid; then
-            # makeinfo found but does not support all options that ecl
-            # likes to use
-            ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-        fi
-    fi
 fi
 
 sdh_configure $SAGE_CONFIGURE_GMP \

diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
@@ -1,4 +1,14 @@
 SAGE_SPKG_CONFIGURE([info], [
   AC_PATH_PROG(INFO, info)
-  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes])
+  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes
+    ], [
+     dnl very old makeinfo are not texi2any, newer are symlinks to texi2any
+     AC_PATH_PROG(TEXI2ANY, texi2any)
+     AS_IF([test -z "${TEXI2ANY}"], [sage_spkg_install_info=yes
+       ], [
+        AS_IF([makeinfo -c foo 2>&1 | grep -q invalid], [
+         dnl makeinfo found, but too old, and  does not support all options that ecl likes to use
+         sage_spkg_install_info=yes])
+       ])
+    ])
 ])
diff --git a/build/pkgs/info/spkg-install.in b/build/pkgs/info/spkg-install.in
@@ -1,2 +1,2 @@
-cd src/info
+cd src
 sdh_make_install
diff --git a/build/pkgs/info/type b/build/pkgs/info/type
@@ -1 +1 @@
-optional
+standard
diff --git a/build/pkgs/maxima/spkg-install.in b/build/pkgs/maxima/spkg-install.in
@@ -26,14 +26,7 @@ cp "$SAGE_ROOT"/config/config.* .
 
 echo
 echo "Now configuring Maxima..."
-if [[ "$SAGE_SPKG_INSTALL_DOCS" != yes ]] ; then
-    sdh_configure --enable-ecl --disable-build-docs git_found=false
-else
-    sdh_configure --enable-ecl git_found=false 
-fi
-# Note the following is regression in maxima build system
-# see https://sourceforge.net/p/maxima/bugs/3278/
-# and https://sourceforge.net/p/maxima/bugs/2878/
+sdh_configure --enable-ecl git_found=false
 
 #---------------------------------------------------------------