diff options
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.patch | 13 |
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 | |||
11 | index bb05105..4b817ac 100644 | 11 | index bb05105..4b817ac 100644 |
12 | --- a/base/configure.ac | 12 | --- a/base/configure.ac |
13 | +++ b/base/configure.ac | 13 | +++ b/base/configure.ac |
14 | @@ -814,17 +814,23 @@ Disabling tiff output devices.]) | 14 | @@ -951,17 +951,22 @@ |
15 | esac | 15 | esac |
16 | 16 | ||
17 | if test $SHARE_LIBTIFF -eq 0; then | 17 | if test $SHARE_LIBTIFF -eq 0; then |
18 | - echo | 18 | - echo |
19 | - echo "Running libtiff configure script..." | 19 | - echo "Running libtiff configure script..." |
20 | - olddir=`pwd` | 20 | - olddir=`pwd` |
21 | - cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS | 21 | - cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS |
22 | - status=$? | 22 | - status=$? |
23 | - if test "$status" -ne 0 ; then | 23 | - if test "$status" -ne 0 ; then |
24 | - AC_MSG_ERROR([libtiff configure script failed], $status) | 24 | - AC_MSG_ERROR([libtiff configure script failed], $status) |
25 | - fi | 25 | - fi |
26 | - cd $olddir | 26 | - cd "$olddir" |
27 | - echo | 27 | - echo |
28 | - echo "Continuing with Ghostscript configuration..." | 28 | - echo "Continuing with Ghostscript configuration..." |
29 | + if test -e $LIBTIFFDIR/configure; then | 29 | + if test -e $LIBTIFFDIR/configure; then |
30 | + echo | 30 | + echo |
31 | + echo "Running libtiff configure script..." | 31 | + echo "Running libtiff configure script..." |
32 | + olddir=`pwd` | 32 | + olddir=`pwd` |
33 | + cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS | 33 | + cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS |
34 | + status=$? | 34 | + status=$? |
35 | + if test "$status" -ne 0 ; then | 35 | + if test "$status" -ne 0 ; then |
36 | + AC_MSG_ERROR([libtiff configure script failed], $status) | 36 | + AC_MSG_ERROR([libtiff configure script failed], $status) |
37 | + fi | 37 | + fi |
38 | + cd $olddir | 38 | + cd "$olddir" |
39 | + echo | 39 | + echo |
40 | + echo "Continuing with Ghostscript configuration..." | 40 | + echo "Continuing with Ghostscript configuration..." |
41 | + else | 41 | + else |
42 | + AC_MSG_NOTICE([Could not find local copy of libtiff. | 42 | + AC_MSG_NOTICE([Could not find local copy of libtiff. |
43 | +Disabling tiff output devices.]) | 43 | +Disabling tiff output devices.]) |
44 | + fi | 44 | + fi |
45 | + | ||
46 | fi | 45 | fi |
47 | 46 | ||
48 | AC_SUBST(SHARE_LIBTIFF) | 47 | AC_SUBST(SHARE_LIBTIFF) |