git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 0124b1c29b9cfe46d73ae82ce023dd7c5b055744 Mon Sep 17 00:00:00 2001
   2 From: Hongxu Jia <hongxu.jia@windriver.com>
   3 Date: Thu, 29 Mar 2018 16:36:12 +0800
   4 Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff
   5
   6 Modify configure to add the check to make sure
   7 ghostscrip could work while system-libtiff is
   8 disabled.
   9
  10 Upstream-Status: Pending
  11
  12 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  13
  14 Rebase to ghostscript 9.25.
  15
  16 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  17 Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
  18 ---
  19  configure.ac | 5 +++++
  20  1 file changed, 5 insertions(+)
  21
  22 diff --git a/configure.ac b/configure.ac
  23 index 80a60b1..f3e9efb 100644
  24 --- a/configure.ac
  25 +++ b/configure.ac
  26 @@ -1319,6 +1319,7 @@ AC_TRY_COMPILE([], [return 0;],
  27  CFLAGS=$CGLAGS_STORE
  28
  29  if test x"$SHARE_LIBTIFF" = x"0" ; then
  30 +    if test -e $LIBTIFFDIR/configure; then
  31        echo "Running libtiff configure script..."
  32        olddir=`pwd`
  33        if ! test -d "$LIBTIFFCONFDIR" ; then
  34 @@ -1337,6 +1338,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
  35
  36        echo
  37        echo "Continuing with Ghostscript configuration..."
  38 +    else
  39 +      AC_MSG_NOTICE([Could not find local copy of libtiff.
  40 +Disabling tiff output devices.])
  41 +    fi
  42  fi
  43
  44  AC_SUBST(SHARE_LIBTIFF)
  45 --
  46 1.8.3.1
  47