Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Mon, 18 Jan 2016 01:00:30 -0500 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH 03/10] configure.ac: do not check local png source |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
| 6 | In oe-core, it did not need to compile local libpng |
| 7 | source in ghostscript, so do not check local png |
| 8 | source, and directly check the existance of shared |
| 9 | libpng library. |
| 10 | |
| 11 | Upstream-Status: Inappropriate [OE-Core specific] |
| 12 | |
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 14 | --- |
| 15 | configure.ac | 4 ++-- |
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 19 | index 9341930..80a60b1 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | @@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 23 | AC_SUBST(FT_SYS_ZLIB) |
| 24 | |
| 25 | dnl png for the png output device; it also requires zlib |
| 26 | -LIBPNGDIR=src |
| 27 | +LIBPNGDIR=$srcdir/libpng |
| 28 | PNGDEVS='' |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 29 | PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 30 | AC_MSG_CHECKING([for local png library source]) |
| 31 | -if test -f $srcdir/libpng/pngread.c; then |
| 32 | +if false; then |
| 33 | AC_MSG_RESULT([yes]) |
| 34 | SHARE_LIBPNG=0 |
| 35 | LIBPNGDIR=$srcdir/libpng |
| 36 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | 1.8.3.1 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 38 | |