diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-02-25 20:50:01 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-02-25 20:50:01 +0000 |
| commit | 3446111ea0c02f68bc95f009d4744db04c3f4845 (patch) | |
| tree | 12f07aa15e13a7a2ee89835da11d35b6b55dbb5a | |
| parent | packaging/osx: don't autorun configure with new autogen.sh (r12150) (diff) | |
| download | inkscape-3446111ea0c02f68bc95f009d4744db04c3f4845.tar.gz inkscape-3446111ea0c02f68bc95f009d4744db04c3f4845.zip | |
Drop manual check for libpng: pkg-config should work
Fixed bugs:
- https://launchpad.net/bugs/261410
- https://launchpad.net/bugs/520521
(bzr r12152)
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 3e9e53212..f1d8d0a48 100644 --- a/configure.ac +++ b/configure.ac @@ -227,14 +227,6 @@ if test "x$openmp_ok" = "xyes"; then 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 ****************************** AC_CHECK_LIB(exif, exif_data_new_from_file, [AC_CHECK_HEADER(libexif/exif-data.h, exif_ok=yes, exif_ok=no)], exif_ok=no, -lm) @@ -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 |