build/pkgs/{freetype,libgd}/spkg-configure.m4: Add depcheck for gcc

Author: Matthias Koeppe

build/pkgs/freetype/spkg-configure.m4

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([freetype], [
-    SAGE_SPKG_DEPCHECK([libpng], [
+    SAGE_SPKG_DEPCHECK([gcc libpng], [
       dnl freetype versions are libtool's ones, cf trac #30014
       PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.1], [], [sage_spkg_install_freetype=yes])
     ])

build/pkgs/libgd/spkg-configure.m4

@@ -1,21 +1,6 @@
 SAGE_SPKG_CONFIGURE([libgd], [
-    AC_REQUIRE([SAGE_SPKG_CONFIGURE_LIBPNG])
-    AC_REQUIRE([SAGE_SPKG_CONFIGURE_FREETYPE])
-    AC_MSG_CHECKING([Installing freetype? ])
-    if test x$sage_spkg_install_freetype = xyes; then
-      AC_MSG_RESULT([Yes. Install libgd as well.])
-      sage_spkg_install_libgd=yes
-    else
-      dnl do not just rely on libpng being a dependency of freetype
-      AC_MSG_CHECKING([Installing libpng? ])
-      if test x$sage_spkg_install_libpng = xyes; then
-        AC_MSG_RESULT([Yes. Install libgd as well.])
-        sage_spkg_install_libgd=yes
-      else
-        AC_MSG_RESULT([No.])
+    dnl Trac #31624: Avoid C++ ABI issues
+    SAGE_SPKG_DEPCHECK([gcc libpng freetype], [
         PKG_CHECK_MODULES([LIBGD], [gdlib >= 2.1], [], [sage_spkg_install_libgd=yes])
-      fi
-    fi
+    ])
 ])
-
-