aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
index ce254f6ece..40afd372d1 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
@@ -11,38 +11,37 @@ diff --git a/base/configure.ac b/base/configure.ac
index bb05105..4b817ac 100644
--- a/base/configure.ac
+++ b/base/configure.ac
-@@ -814,17 +814,23 @@ Disabling tiff output devices.])
+@@ -951,17 +951,22 @@
esac
if test $SHARE_LIBTIFF -eq 0; then
- echo
- echo "Running libtiff configure script..."
- olddir=`pwd`
-- cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS
+- cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS
- status=$?
- if test "$status" -ne 0 ; then
- AC_MSG_ERROR([libtiff configure script failed], $status)
- fi
-- cd $olddir
+- cd "$olddir"
- echo
- echo "Continuing with Ghostscript configuration..."
+ if test -e $LIBTIFFDIR/configure; then
+ echo
+ echo "Running libtiff configure script..."
+ olddir=`pwd`
-+ cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS
++ cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS
+ status=$?
+ if test "$status" -ne 0 ; then
-+ AC_MSG_ERROR([libtiff configure script failed], $status)
++ AC_MSG_ERROR([libtiff configure script failed], $status)
+ fi
-+ cd $olddir
++ cd "$olddir"
+ echo
+ echo "Continuing with Ghostscript configuration..."
+ else
+ AC_MSG_NOTICE([Could not find local copy of libtiff.
+Disabling tiff output devices.])
+ fi
-+
fi
AC_SUBST(SHARE_LIBTIFF)