blob: ce254f6ece5fe7ce2ab7fc73790dd214f4a396ae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
ghostscript-native:fix disable-system-libtiff
Modify configure to add the check to make sure
ghostscrip could work while system-libtiff is
disabled.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Pending
---
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.])
esac
if test $SHARE_LIBTIFF -eq 0; then
- echo
- echo "Running libtiff configure script..."
- olddir=`pwd`
- cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS
- status=$?
- if test "$status" -ne 0 ; then
- AC_MSG_ERROR([libtiff configure script failed], $status)
- fi
- 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
+ status=$?
+ if test "$status" -ne 0 ; then
+ AC_MSG_ERROR([libtiff configure script failed], $status)
+ fi
+ 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)
--
1.7.10.4
|