From: Matthew Fernandez Date: Fri, 14 Oct 2022 00:15:45 +0000 (-0700) Subject: remove checks for librsvg ≥2.36.0 and 'HAVE_SVG_2_36' X-Git-Tag: 7.0.0~5^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c9566d17b2c81cb1154f0250521c2a9933e7b92;p=graphviz remove checks for librsvg ≥2.36.0 and 'HAVE_SVG_2_36' The only code that used this was removed in 63a5fcd96f53761630a37fff7657db5d03619a7d. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b609dfc33..bc3f5e96c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,11 +194,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphviz_version.h DESTINATION ${HEADE message(STATUS "Graphviz version: ${GRAPHVIZ_VERSION_FULL}") -find_package(PkgConfig) -if(PkgConfig_FOUND) - pkg_check_modules(SVG_2_36 librsvg-2.0>=2.36.0 cairo>=1.0.0) -endif() - include(config_checks) if(NOT HAVE_GETOPT_H) find_package(GETOPT REQUIRED) diff --git a/cmake/config_checks.cmake b/cmake/config_checks.cmake index b9d9f1783..4b9ab3e0c 100644 --- a/cmake/config_checks.cmake +++ b/cmake/config_checks.cmake @@ -40,7 +40,6 @@ set( HAVE_ANN ${ANN_FOUND} ) set( HAVE_EXPAT ${EXPAT_FOUND} ) set( HAVE_LIBGD ${GD_FOUND} ) set( HAVE_ZLIB ${ZLIB_FOUND} ) -set( HAVE_SVG_2_36 ${SVG_2_36_FOUND} ) if(LTDL_FOUND) set(ENABLE_LTDL 1) diff --git a/configure.ac b/configure.ac index 7d9c4d59b..381febd57 100644 --- a/configure.ac +++ b/configure.ac @@ -1677,7 +1677,6 @@ AC_ARG_WITH(rsvg, [AS_HELP_STRING([--with-rsvg=yes],[rsvg library])], [], [with_rsvg=yes]) -have_svg_2_36="no" if test "x$with_rsvg" != "xyes"; then use_rsvg="No (disabled)" else @@ -1690,12 +1689,6 @@ else ],[ use_rsvg="No (rsvg library not available)" ]) - PKG_CHECK_MODULES([SVG_2_36], [librsvg-2.0 >= 2.36.0 cairo >= 1.0.0],[ - have_svg_2_36="yes" - AC_DEFINE(HAVE_SVG_2_36, 1, [Have librsvg >= 2.36]) - ],[ - have_svg_2_36="no" - ]) fi AM_CONDITIONAL(WITH_RSVG, [test "x$use_rsvg" = "xYes"])