Mercurial > mxe-octave

comparison src/gnu-linux-ghostscript-configure.patch @ 3653:3085b1b955dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make native ghostscript build work; include ghostscript patches in dist file
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jul 2014 10:08:07 -0400
parents
children
comparison
equal deleted inserted replaced
3652:7af3dec1ab50 3653:3085b1b955dd
1 diff -ur a/base/configure.ac b/base/configure.ac
2 --- a/base/configure.ac 2013-02-14 02:58:13.000000000 -0500
3 +++ b/base/configure.ac 2014-07-08 09:44:59.470110783 -0400
4 @@ -819,46 +819,11 @@
5 AC_SUBST(LIBPNGDIR)
6 #AC_SUBST(PNGDEVS)
7
8 -WHICHLCMS=
9 -
10 -AC_ARG_WITH([lcms], AC_HELP_STRING([--with-lcms],
11 - [try to use LittleCMS 1.x instead of the default of LittleCMS 2.x]))
12 -
13 -if test x$with_lcms != xyes; then
14 - AC_MSG_CHECKING([for local lcms2 library source])
15 - LCMS2DIR=lcms2
16 - if test -f $LCMS2DIR/include/lcms2.h; then
17 - AC_MSG_RESULT([yes])
18 - SHARELCMS=0
19 - WHICHLCMS=lcms2
20 - else
21 - AC_MSG_RESULT([no])
22 - AC_MSG_CHECKING([for system lcms2 library])
23 - AC_CHECK_LIB(lcms2, cmsGetTransformOutputFormat, [
24 - AC_CHECK_HEADERS([lcms2.h], [LCMS2DIR="";SHARELCMS=1;WHICHLCMS=lcms2])
25 - ])
26 - if test x$WHICHLCMS = x; then
27 - AC_MSG_WARN([lcms2 not found, or too old])
28 - fi
29 - fi
30 -fi
31 -
32 -if test x$WHICHLCMS = x; then
33 - AC_MSG_CHECKING([for local lcms library source])
34 - LCMSDIR=lcms
35 - SHARELCMS=0
36 - if test -f $LCMSDIR/include/lcms.h; then
37 - AC_MSG_RESULT([yes])
38 - SHARELCMS=0
39 - WHICHLCMS=lcms
40 - else
41 -
42 - AC_MSG_ERROR([LittleCMS source not found!])
43 - #AC_CHECK_LIB(lcms, cmsCreateXYZProfile, [
44 - # AC_CHECK_HEADERS([lcms.h], [SHARELCMS=1;LCMSDIR=""])
45 - # ])
46 - fi
47 -fi
48 +AC_MSG_NOTICE([unconditionally using installed lcms library])
49 +SHARELCMS=1
50 +WHICHLCMS=lcms2
51 +LCMSDIR=
52 +LCMS2DIR=
53
54 AC_SUBST(SHARELCMS)
55 AC_SUBST(WHICHLCMS)