Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@intel.com> |
| 6 | Date: Tue, 10 Dec 2013 11:37:32 +0000 |
| 7 | Subject: [PATCH] configure: improve libpng detection |
| 8 | |
| 9 | Instead of looking for "libpng12" explicitly though pkg-config and then falling |
| 10 | back to library hunting, just use pkg-config to find "libpng" which is provided |
| 11 | by both libpng12 and libpng16. |
| 12 | |
| 13 | This also makes the libpng detection deterministic. |
| 14 | |
| 15 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 16 | --- |
| 17 | configure.ac | 29 +++++------------------------ |
| 18 | 1 file changed, 5 insertions(+), 24 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 8a28076..65d7c79 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg, |
| 25 | enable_jpeg=$enableval, enable_jpeg=no) |
| 26 | |
| 27 | AC_ARG_ENABLE(png, |
| 28 | - [ --disable-png disable png support [default=no]], |
| 29 | + [ --disable-png disable PNG support [default=enabled]], |
| 30 | enable_png=$enableval, enable_png=yes ) |
| 31 | |
| 32 | AC_ARG_ENABLE(doxygen-docs, |
| 33 | @@ -156,29 +156,10 @@ fi |
| 34 | dnl ------ Check for PNG --------------------------------------------------- |
| 35 | |
| 36 | if test x$enable_png != xno; then |
| 37 | - AC_MSG_CHECKING(for libpng12) |
| 38 | - if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then |
| 39 | - AC_MSG_RESULT(yes) |
| 40 | - PNG_LIBS=`$PKG_CONFIG --libs libpng12` |
| 41 | - PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` |
| 42 | - AC_DEFINE(USE_PNG, [1], [Use Png]) |
| 43 | - SUPPORTS_PNG=1 |
| 44 | - PNG_REQUIRED="libpng12" |
| 45 | - else |
| 46 | - AC_MSG_RESULT(no) |
| 47 | - # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] ) |
| 48 | - AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"]) |
| 49 | - |
| 50 | - if test x$have_png=xyes && test x$have_png_h=xyes; then |
| 51 | - AC_DEFINE(USE_PNG, [1], [Use Png]) |
| 52 | - SUPPORTS_PNG=1 |
| 53 | - PNG_LIBS="-lpng -lz" |
| 54 | - MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" |
| 55 | - else |
| 56 | - AC_MSG_WARN([*** Cannot find PNG, disabling support]) |
| 57 | - enable_png=no |
| 58 | - fi |
| 59 | - fi |
| 60 | + PKG_CHECK_MODULES(PNG, libpng) |
| 61 | + AC_DEFINE(USE_PNG, [1], [Use PNG]) |
| 62 | + SUPPORTS_PNG=1 |
| 63 | + PNG_REQUIRED="libpng" |
| 64 | fi |
| 65 | |
| 66 | |
| 67 | -- |
| 68 | 1.8.5 |
| 69 | |