From 3446111ea0c02f68bc95f009d4744db04c3f4845 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 25 Feb 2013 20:50:01 +0000 Subject: Drop manual check for libpng: pkg-config should work Fixed bugs: - https://launchpad.net/bugs/261410 - https://launchpad.net/bugs/520521 (bzr r12152) --- configure.ac | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 3e9e53212..f1d8d0a48 100644 --- a/configure.ac +++ b/configure.ac @@ -226,14 +226,6 @@ if test "x$openmp_ok" = "xyes"; then AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) fi -dnl ****************************** -dnl Check for libpng -dnl ****************************** -AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm) -if test "x$png_ok" != "xyes"; then - AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape]) -fi - dnl ****************************** dnl Check for libexif dnl ****************************** @@ -970,8 +962,8 @@ if test "x$cairo_pdf" = "xyes"; then AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available]) fi -dnl Shouldn't we test for libpng and libz? -INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl" +dnl Shouldn't we test for libz? +INKSCAPE_LIBS="$INKSCAPE_LIBS -lz -lxml2 -ldl" if test "x$openmp_ok" = "xyes"; then INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp" fi -- cgit v1.2.3