mxe-octave: src/ghostscript-1-fixes.patch annotate

annotate src/ghostscript-1-fixes.patch @ 5895:2db7f803d55d release

librsb: Update to version 1.2.0.10 (bug #60042). * src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sun, 19 Sep 2021 14:32:07 +0200
parents	9ecdae39c4f8
children	b022da047e9b

rev	line source
4959 506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	1 This file is part of MXE. See LICENSE.md for licensing information.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	2
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	3 Contains ad hoc patches for cross building.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	4
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	6 From: darealshinji <djcj@gmx.de>
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	7 Date: Mon, 3 Dec 2018 21:05:41 +0100
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	8 Subject: [PATCH 1/1] cross-build fixes, hide libgs symbols
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	9
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	10
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	11 diff --git a/Makefile.in b/Makefile.in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	12 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	13 --- a/Makefile.in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	14 +++ b/Makefile.in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	15 @@ -173,6 +173,9 @@ CAPOPT= @HAVE_MKSTEMP@ @HAVE_FILE64@ @HAVE_FSEEKO@ @HAVE_MKSTEMP64@ @HAVE_FONTCO
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	16
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	17 GS=@GS@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	18 GS_SO_BASE=@GS@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	19 +GS_SONAME=@GS_SONAME@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	20 +GS_SONAME_MAJOR=@GS_SONAME_MAJOR@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	21 +GS_SONAME_MAJOR_MINOR=@GS_SONAME_MAJOR_MINOR@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	22
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	23 PCL=@PCL@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	24 PCL_SO_BASE=@PCL@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	25 @@ -184,7 +187,7 @@ GPDL=@GPDL@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	26 GPDL_SO_BASE=@GPDL@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	27
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	28 XE=@EXEEXT@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	29 -XEAUX=@EXEEXT@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	30 +XEAUX=@AUXEXEEXT@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	31
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	32 PCL_TARGET=@PCL_TARGET@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	33 XPS_TARGET=@XPS_TARGET@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	34 diff --git a/base/gp_unix.c b/base/gp_unix.c
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	35 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	36 --- a/base/gp_unix.c
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	37 +++ b/base/gp_unix.c
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	38 @@ -16,6 +16,9 @@
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	39
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	40 /* Unix-specific routines for Ghostscript */
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	41
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	42 +#ifdef __MINGW32__
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	43 +# include "windows_.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	44 +#endif
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	45 #include "pipe_.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	46 #include "string_.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	47 #include "time_.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	48 @@ -454,3 +457,54 @@ void gp_enumerate_fonts_free(void *enum_state)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	49 }
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	50 #endif
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	51 }
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	52 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	53 +/* A function to decode the next codepoint of the supplied args from the
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	54 + * local windows codepage, or -1 for EOF.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	55 + * (copied from gp_win32.c)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	56 + */
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	57 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	58 +#ifdef __MINGW32__
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	59 +int
5189 9ecdae39c4f8 ghostscript: update to v9.50 John Donoghue parents: 4959 diff changeset	60 +gp_local_arg_encoding_get_codepoint(gp_file file, const char *astr)
4959 506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	61 +{
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	62 + int len;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	63 + int c;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	64 + char arg[3];
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	65 + wchar_t unicode[2];
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	66 + char utf8[4];
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	67 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	68 + if (file) {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	69 + c = fgetc(file);
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	70 + if (c == EOF)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	71 + return EOF;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	72 + } else if (**astr) {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	73 + c = (astr)++;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	74 + if (c == 0)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	75 + return EOF;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	76 + } else {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	77 + return EOF;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	78 + }
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	79 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	80 + arg[0] = c;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	81 + if (IsDBCSLeadByte(c)) {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	82 + if (file) {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	83 + c = fgetc(file);
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	84 + if (c == EOF)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	85 + return EOF;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	86 + } else if (**astr) {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	87 + c = (astr)++;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	88 + if (c == 0)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	89 + return EOF;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	90 + }
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	91 + arg[1] = c;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	92 + len = 2;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	93 + } else {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	94 + len = 1;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	95 + }
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	96 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	97 + /* Convert the string (unterminated in, unterminated out) */
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	98 + len = MultiByteToWideChar(CP_ACP, 0, arg, len, unicode, 2);
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	99 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	100 + return unicode[0];
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	101 +}
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	102 +#endif /* __MINGW32__ */
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	103 diff --git a/base/unix-aux.mak b/base/unix-aux.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	104 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	105 --- a/base/unix-aux.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	106 +++ b/base/unix-aux.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	107 @@ -57,23 +57,29 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.c $(AK)\
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	108 # -------------------------- Auxiliary programs --------------------------- #
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	109
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	110 $(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	111 + test -e $(ECHOGS_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	112 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	113
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	114 $(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	115 + test -e $(PACKPS_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	116 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	117
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	118 # On the RS/6000 (at least), compiling genarch.c with gcc with -O
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	119 # produces a buggy executable.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	120 $(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	121 + test -e $(GENARCH_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	122 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	123
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	124 $(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	125 + test -e $(GENCONF_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	126 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	127
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	128 $(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	129 + test -e $(GENDEV_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	130 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	131
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	132 $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	133 + test -e $(GENHT_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	134 $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	135
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	136 # To get GS to use the system zlib, you remove/hide the gs/zlib directory
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	137 @@ -84,6 +90,7 @@ MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	138 $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	139
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	140 $(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	141 + test -e $(MKROMFS_XE)_0 \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	142 $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	143
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	144 # .... and one using the zlib library linked via the command line
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	145 @@ -93,9 +100,11 @@ MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	146 $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	147
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	148 $(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	149 + test -e $(MKROMFS_XE)_1 \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	150 $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	151
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	152 $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	153 + test -e $(MKROMFS_XE) \|\| \
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	154 $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	155
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	156 # Query the environment to construct gconfig_.h.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	157 diff --git a/base/unix-dll.mak b/base/unix-dll.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	158 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	159 --- a/base/unix-dll.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	160 +++ b/base/unix-dll.mak
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	161 @@ -66,9 +66,6 @@ GPDL_SONAME_BASE=lib$(GPDL_SO_BASE)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	162 GS_SOEXT=$(SO_LIB_EXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	163 GS_DLLEXT=$(DLL_EXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	164
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	165 -GS_SONAME=$(GS_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	166 -GS_SONAME_MAJOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	167 -GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	168
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	169 PCL_SONAME=$(PCL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	170 PCL_SONAME_MAJOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	171 diff --git a/configure.ac b/configure.ac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	172 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	173 --- a/configure.ac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	174 +++ b/configure.ac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	175 @@ -23,6 +23,7 @@ AC_INIT
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	176 AC_PREREQ(2.63)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	177 AC_LANG(C)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	178 AC_CONFIG_SRCDIR(psi/gs.c)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	179 +AC_CANONICAL_HOST
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	180
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	181 dnl Inherit compiler flags from the environment...
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	182 CFLAGS="${CFLAGS:=}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	183 @@ -125,8 +126,11 @@ AUXEXTRALIBSTMP="\$(EXTRALIBS)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	184
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	185 # purposefully do not include "help" output for this
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	186 AC_ARG_ENABLE([save_confaux])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	187 +AC_ARG_ENABLE([auxtools_only])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	188
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	189 -if test x"$CCAUX" != x"" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	190 +absolute_source_path=$(cd "$(dirname "$0")" && pwd)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	191 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	192 +if test x"$host" != x"$build" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	193 # rerun configure for the AUX tools, disabling a load of tests not relevant for CCAUX
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	194 olddir=`pwd`
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	195 if test x"$enable_save_confaux" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	196 @@ -146,9 +150,10 @@ if test x"$CCAUX" != x"" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	197 echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	198 echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	199
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	200 - ../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	201 + AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	202 + "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	203 status=$?
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	204 - cp config.log ../configaux.log
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	205 + cp config.log $olddir/configaux.log
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	206 if test $status -eq 0 ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	207 CCAUX=$(grep CCAUX $AUXFLAGS_MAK \| sed "s/CCAUX=//g")
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	208 GCFLAGSAUXTMP=$(grep GCFLAGSAUX $AUXFLAGS_MAK \| sed "s/GCFLAGSAUX=//g")
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	209 @@ -204,7 +209,7 @@ AC_PATH_TOOL(PKGCONFIG, pkg-config)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	210 # but if we are cross compiling, and there isn't a matching
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	211 # pkconfig for the --host setting, then don't use the 'local'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	212 # pkconfig at all
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	213 -if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	214 +if test x"$host" != x"$build" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	215 AC_PATH_PROG(BUILD_PKGCONFIG, pkg-config)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	216 if test x"$BUILD_PKGCONFIG" = x"$PKGCONFIG" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	217 PKGCONFIG=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	218 @@ -217,7 +222,7 @@ AC_PATH_TOOL(STRIP_XE, strip)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	219 # but if we are cross compiling, and there isn't a matching
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	220 # pkconfig for the --host setting, then don't use the 'local'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	221 # pkconfig at all
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	222 -if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	223 +if test x"$host" != x"$build" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	224 AC_PATH_PROG(BUILD_STRIP_XE, strip)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	225 if test x"$BUILD_STRIP_XE" = x"$STRIP_XE" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	226 STRIP_XE=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	227 @@ -234,18 +239,14 @@ CONTRIBINCLUDE="include $srcdir/contrib/contrib.mak"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	228 INSTALL_CONTRIB="install-contrib-extras"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	229
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	230 if test x"$enable_contrib" = x; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	231 - if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	232 - enable_contrib=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	233 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	234 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	235 - MINGW\|MSYS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	236 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	237 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	238 AC_MSG_WARN([disabling contrib devices])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	239 enable_contrib=no
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	240 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	241 *)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	242 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	243 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	244 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	245 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	246
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	247 if test x"$enable_contrib" != x"no"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	248 @@ -274,26 +275,27 @@ dnl --------------------------------------------------
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	249 CC_OPT_FLAGS_TO_TRY="-O"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	250 SET_DT_SONAME="-soname="
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	251
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	252 -if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	253 - if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	254 - CC_OPT_FLAGS_TO_TRY="-O2"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	255 - CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	256 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	257 -else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	258 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	259 - Linux\|GNU)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	260 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	261 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	262 if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	263 CC_OPT_FLAGS_TO_TRY="-O2"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	264 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	265 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	266 + SET_DT_SONAME=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	267 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	268 - *BSD)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	269 + -linux\|*-gnu)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	270 + if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	271 + CC_OPT_FLAGS_TO_TRY="-O2"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	272 + CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	273 + fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	274 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	275 + bsd)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	276 if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	277 CC_OPT_FLAGS_TO_TRY="-O2"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	278 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	279 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	280 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	281 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	282 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	283 if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	284 CC_OPT_FLAGS_TO_TRY="-O2"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	285 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	286 @@ -321,7 +323,6 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	287 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	288 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	289 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	290 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	291
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	292 AC_SUBST(SET_DT_SONAME)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	293
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	294 @@ -368,18 +369,20 @@ AC_ARG_WITH([arch_h], AC_HELP_STRING([--with-arch_h=<arch.h to use>],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	295 ARCH_CONF_HEADER=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	296
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	297 if test x"$with_arch_h" = x""; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	298 - if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	299 - ARCH_CONF_HEADER="\$(GLSRCDIR)/../$ARCH_AUTOCONF_HEADER"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	300 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	301 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	302 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	303 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	304 + x86_64-mingw\|x86_64-msys\|x86_64-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	305 + ARCH_CONF_HEADER="\$(GLSRCDIR)/../arch/windows-x64-msvc.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	306 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	307 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	308 + ARCH_CONF_HEADER="\$(GLSRCDIR)/../arch/windows-x86-msvc.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	309 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	310 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	311 ARCH_CONF_HEADER="\$(GLSRCDIR)/../arch/osx-x86-x86_64-ppc-gcc.h"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	312 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	313 *)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	314 ARCH_CONF_HEADER=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	315 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	316 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	317 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	318 else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	319 ARCH_CONF_HEADER=$with_arch_h
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	320 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	321 @@ -658,15 +661,7 @@ dnl Set options that we want to pass into all other
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	322 dnl configure scripts we might call
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	323 dnl --------------------------------------------------
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	324
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	325 -SUBCONFIG_OPTS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	326 -
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	327 -if test x"$build_alias" != x""; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	328 - SUBCONFIG_OPTS="$SUBCONFIG_OPTS --build=$build_alias"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	329 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	330 -
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	331 -if test x"$host_alias" != x""; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	332 - SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	333 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	334 +SUBCONFIG_OPTS="--build=$build --host=$host"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	335
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	336 dnl --------------------------------------------------
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	337 dnl Check for libraries
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	338 @@ -996,7 +991,7 @@ if test x"$enable_fapi" != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	339 if $PKGCONFIG --atleast-version=12.0.6 freetype2; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	340 AC_MSG_RESULT(yes)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	341 FT_CFLAGS="$CFLAGS `$PKGCONFIG --cflags freetype2`"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	342 - FT_LIBS="`$PKGCONFIG --libs freetype2`"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	343 + FT_LIBS="`$PKGCONFIG --libs-only-l freetype2`"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	344 FT_BRIDGE=1
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	345 SHARE_FT=1
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	346 else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	347 @@ -1047,6 +1042,14 @@ AC_SUBST(FTSRCDIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	348 AC_SUBST(FT_CFLAGS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	349 AC_SUBST(FT_LIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	350
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	351 +if test x"$enable_auxtools_only" = x"yes" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	352 + LIBJPEGDIR=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	353 + SHARE_LIBJPEG=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	354 + AC_DEFINE([DONT_HAVE_JMEMSYS_H], 1, [])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	355 + AC_SUBST(SHARE_LIBJPEG)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	356 + AC_SUBST(LIBJPEGDIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	357 +else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	358 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	359 AC_MSG_CHECKING([for local jpeg library source])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	360 dnl At present, we give the local source priority over the shared
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	361 dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	362 @@ -1088,6 +1091,13 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	363 [define if the libjpeg memory system prototypes aren't available])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	364 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	365
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	366 +fi # $enable_auxtools_only
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	367 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	368 +# this option is useful if you're cross-compiling and want to use
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	369 +# your toolchain's zlib for $host but the local one for $build
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	370 +AC_ARG_WITH([local-zlib], AC_HELP_STRING([--without-local-zlib],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	371 + [do not check for local zlib sources (has no effect on AUX toolchain when cross-building)]))
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	372 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	373 AC_MSG_CHECKING([for local zlib source])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	374 dnl zlib is needed for language level 3, and libpng
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	375 # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	376 @@ -1096,6 +1106,13 @@ ZLIBDIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	377 AUX_SHARED_ZLIB=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	378 ZLIBCFLAGS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	379
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	380 +if test x"$with_local_zlib" = x"no" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	381 + AC_MSG_RESULT([skip])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	382 + AC_CHECK_LIB(z, deflate, [
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	383 + AC_CHECK_HEADERS(zlib.h, [SHARE_ZLIB=1; AUX_SHARED_ZLIB="-l\$(ZLIB_NAME)"])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	384 + ])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	385 +else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	386 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	387 if test -d $srcdir/zlib; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	388 AC_MSG_RESULT([yes])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	389 SHARE_ZLIB=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	390 @@ -1110,6 +1127,9 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	391 AC_CHECK_HEADERS(zlib.h, [SHARE_ZLIB=1; AUX_SHARED_ZLIB="-l\$(ZLIB_NAME)"])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	392 ])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	393 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	394 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	395 +fi # $with_local_zlib
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	396 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	397 if test -z "$SHARE_ZLIB"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	398 AC_MSG_ERROR([I did not find a copy of zlib on your system.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	399 Please either install it, or unpack a copy of the source in a
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	400 @@ -1136,6 +1156,11 @@ AC_SUBST(ZLIBDIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	401 AC_SUBST(FT_SYS_ZLIB)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	402
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	403 dnl png for the png output device; it also requires zlib
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	404 +if test x"$enable_auxtools_only" = x"yes" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	405 + LIBPNGDIR=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	406 + SHARE_LIBPNG=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	407 +else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	408 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	409 LIBPNGDIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	410 PNGDEVS=''
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	411 PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	412 @@ -1157,12 +1182,21 @@ fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	413 if test -z "$PNGDEVS"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	414 AC_MSG_NOTICE([disabling png output devices])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	415 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	416 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	417 +fi # $enable_auxtools_only
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	418 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	419 AC_SUBST(SHARE_LIBPNG)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	420 AC_SUBST(LIBPNGDIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	421 #AC_SUBST(PNGDEVS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	422
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	423 WHICHLCMS=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	424
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	425 +if test x"$enable_auxtools_only" = x"yes" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	426 + SHARELCMS=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	427 + LCMS2DIR=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	428 + LCMS2MTDIR=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	429 +else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	430 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	431 AC_MSG_CHECKING([for local lcms2mt library source])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	432 LCMS2DIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	433 LCMS2MTDIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	434 @@ -1197,6 +1231,8 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	435 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	436 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	437
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	438 +fi # $enable_auxtools_only
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	439 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	440 AC_SUBST(SHARELCMS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	441 AC_SUBST(WHICHLCMS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	442 AC_SUBST(LCMS2DIR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	443 @@ -1349,7 +1385,7 @@ EXPATDIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	444 EXPAT_CFLAGS=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	445 EXPAT_LIBS=
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	446
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	447 -if test x"$with_xps" != x"no" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	448 +if test x"$with_xps" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	449 if test -f $srcdir/xps/xps.mak; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	450 AC_MSG_CHECKING([for local expat library source])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	451 if test -f $srcdir/expat/lib/expat.h ; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	452 @@ -1528,16 +1564,14 @@ dnl look for IJS implementation
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	453 AC_ARG_WITH([ijs], AC_HELP_STRING([--without-ijs],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	454 [disable IJS driver support]))
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	455
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	456 -if test x"$cross_compiling" != x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	457 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	458 - MINGW\|MSYS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	459 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	460 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	461 AC_MSG_WARN([disabling the ijs device])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	462 with_ijs=no
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	463 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	464 *)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	465 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	466 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	467 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	468
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	469 dnl set safe defaults
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	470 IJSDIR=src
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	471 @@ -1589,15 +1623,8 @@ if test x$with_luratech != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	472 SHARE_JBIG2=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	473 JBIG2DIR=$srcdir/luratech/ldf_jb2
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	474
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	475 - if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	476 - if test x"$JBIG2_CFLAGS" != x""; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	477 - JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -fsigned-char $JBIG2_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	478 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	479 - JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -fsigned-char -DLINUX=1 -DFORTE"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	480 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	481 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	482 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	483 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	484 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	485 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	486 JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -DMAC -DMAC_OS_X_BUILD -fsigned-char"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	487 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	488 AIX)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	489 @@ -1611,7 +1638,6 @@ if test x$with_luratech != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	490 JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -fsigned-char -DLINUX=1 -DFORTE"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	491 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	492 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	493 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	494
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	495 JBIG2FILEDEVS='$(DD)gdevjbig2.dev'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	496 JBIG2DEVS='$(PSD)jbig2.dev'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	497 @@ -1718,15 +1744,8 @@ if test x$with_luratech != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	498 SHARE_JPX=0
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	499 JPXDIR=$srcdir/luratech/lwf_jp2
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	500
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	501 - if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	502 - if test x"$JPX_CFLAGS" != x""; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	503 - JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 $JPX_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	504 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	505 - JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DLINUX=1 -DFORTE"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	506 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	507 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	508 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	509 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	510 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	511 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	512 JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DMAC -DMAC_OS_X_BUILD"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	513 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	514 AIX)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	515 @@ -1740,7 +1759,6 @@ if test x$with_luratech != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	516 JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DLINUX=1 -DFORTE"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	517 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	518 esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	519 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	520 JPXDEVS='$(PSD)jpx.dev'
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	521 else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	522 AC_MSG_RESULT([no])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	523 @@ -2357,22 +2375,15 @@ SO_LIB_EXT=".so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	524 DLL_EXT=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	525 SO_LIB_VERSION_SEPARATOR="."
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	526
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	527 -if test x"$cross_compiling" = x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	528 - DYNAMIC_CFLAGS="-fPIC"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	529 - GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	530 - PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	531 - XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	532 - PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	533 - if test $ac_cv_prog_gcc = yes; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	534 - # GCC high level flag
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	535 - DYNAMIC_LIBS="-rdynamic"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	536 - else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	537 - DYNAMIC_LIBS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	538 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	539 - SO_LIB_EXT=".so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	540 -else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	541 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	542 - Linux\|GNU)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	543 +libname1="_SO_BASE)\$(GS_SOEXT)\$(DLL_EXT)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	544 +libname2="_SO_BASE)\$(GS_SOEXT)\$(SO_LIB_VERSION_SEPARATOR)\$(GS_VERSION_MAJOR)\$(DLL_EXT)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	545 +libname3="_SO_BASE)\$(GS_SOEXT)\$(SO_LIB_VERSION_SEPARATOR)\$(GS_VERSION_MAJOR)\$(SO_LIB_VERSION_SEPARATOR)\$(GS_VERSION_MINOR)\$(DLL_EXT)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	546 +GS_SONAME="lib\$(GS${libname1}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	547 +GS_SONAME_MAJOR="lib\$(GS${libname2}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	548 +GS_SONAME_MAJOR_MINOR="lib\$(GS${libname3}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	549 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	550 +case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	551 + -linux\|*-gnu)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	552 DYNAMIC_CFLAGS="-fPIC"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	553 GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	554 PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	555 @@ -2386,17 +2397,21 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	556 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	557 SO_LIB_EXT=".so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	558 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	559 - MINGW\|MSYS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	560 - DYNAMIC_CFLAGS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	561 - GS_DYNAMIC_LDFLAGS="-shared -Wl,--out-implib=\$(BINDIR)/lib\$(GS_SO_BASE).dll.a -Wl,--export-all-symbols -Wl,--enable-auto-import"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	562 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	563 + DYNAMIC_CFLAGS="-fvisibility=hidden -DGSDLLEXPORT=\"__declspec(dllexport)\""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	564 + GS_DYNAMIC_LDFLAGS="-shared -Wl,--out-implib=\$(BINDIR)/lib\$(GS_SO_BASE).dll.a -Wl,--enable-auto-import"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	565 PCL_DYNAMIC_LDFLAGS="-shared -Wl,--out-implib=\$(BINDIR)/lib\$(PCL_SO_BASE).dll.a -Wl,--export-all-symbols -Wl,--enable-auto-import"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	566 XPS_DYNAMIC_LDFLAGS="-shared -Wl,--out-implib=\$(BINDIR)/lib\$(XPS_SO_BASE).dll.a -Wl,--export-all-symbols -Wl,--enable-auto-import"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	567 PDL_DYNAMIC_LDFLAGS="-shared -Wl,--out-implib=\$(BINDIR)/lib\$(PDL_SO_BASE).dll.a -Wl,--export-all-symbols -Wl,--enable-auto-import"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	568 SO_LIB_EXT=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	569 DLL_EXT=".dll"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	570 SO_LIB_VERSION_SEPARATOR="-"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	571 + # make sure the import library doesn't link a program against the DLL with the minor version in it
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	572 + GS_SONAME="lib\$(GS${libname1}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	573 + GS_SONAME_MAJOR="lib\$(GS${libname3}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	574 + GS_SONAME_MAJOR_MINOR="lib\$(GS${libname2}"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	575 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	576 - *BSD)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	577 + bsd)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	578 DYNAMIC_CFLAGS="-fPIC"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	579 GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	580 PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	581 @@ -2404,7 +2419,7 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	582 DYNAMIC_LIBS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	583 SO_LIB_EXT=".so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	584 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	585 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	586 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	587 GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	588 PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	589 XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	590 @@ -2442,15 +2457,18 @@ else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	591 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	592 SO_LIB_EXT=".so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	593 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	594 - esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	595 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	596 +esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	597 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	598 +AC_SUBST(GS_SONAME)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	599 +AC_SUBST(GS_SONAME_MAJOR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	600 +AC_SUBST(GS_SONAME_MAJOR_MINOR)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	601
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	602 AC_ARG_ENABLE([dynamic], AC_HELP_STRING([--enable-dynamic],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	603 [Enable dynamically loaded drivers]),
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	604 [
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	605 if test "x$enable_dynamic" != xno; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	606 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	607 - Linux\|GNU)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	608 + case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	609 + -linux\|*-gnu)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	610 INSTALL_SHARED="install-shared"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	611 if test "x$X_DEVS" != x; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	612 DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	613 @@ -2462,14 +2480,14 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING([--enable-dynamic],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	614 OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	615 DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	616 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	617 - *BSD)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	618 + bsd)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	619 DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	620 DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	621 X11_DEVS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	622 OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	623 DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	624 ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	625 - Darwin*)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	626 + -darwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	627 INSTALL_SHARED="install-shared"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	628 DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	629 X11_DEVS=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	630 @@ -2814,23 +2832,31 @@ AC_SUBST(AUXDIRPOSTFIX)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	631 # usually empty on Unix-like systems
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	632 # --------------------------------------------------
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	633 EXEEXT=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	634 +AUXEXEEXT=""
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	635 +
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	636 +case $host in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	637 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	638 + EXEEXT=".exe"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	639 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	640 + *)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	641 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	642 +esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	643
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	644 AC_ARG_WITH([exe-ext], AC_HELP_STRING([--with-exe-ext=EXT],
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	645 - [set the file name executable extension (must include any separator e.g. the period in ".exe")]),[], [exe_ext=])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	646 + [set the file name executable extension (must include any separator e.g. the period in ".exe")]),
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	647 + [EXEEXT="$with_exe_ext"])
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	648
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	649 -if test "x"$with_exe_ext != "x"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	650 - EXEEXT="$with_exe_ext"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	651 -else
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	652 - if test x"$cross_compiling" != x"yes"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	653 - case `uname` in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	654 - MINGW\|MSYS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	655 - EXEEXT=".exe"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	656 - ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	657 - esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	658 - fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	659 -fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	660 +case $build in
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	661 + -mingw\|-msys\|-cygwin)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	662 + AUXEXEEXT=".exe"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	663 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	664 + *)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	665 + AUXEXEEXT="$EXEEXT"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	666 + ;;
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	667 +esac
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	668
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	669 AC_SUBST(EXEEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	670 +AC_SUBST(AUXEXEEXT)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	671
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	672 # --------------------------------------------------
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	673 # Check for disabling of versioned path option.
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	674 @@ -2885,7 +2911,7 @@ fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	675
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	676 AC_SUBST(CLUSTER_CFLAGS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	677
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	678 -if test x"$CCAUX" != x"$CC"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	679 +if test x"$build" != x"$host"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	680
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	681 ilog2()
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	682 {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	683 @@ -3025,7 +3051,7 @@ AC_SUBST(AUXEXTRALIBS)
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	684
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	685 CONFIG_FILES_LIST="$CONFIG_FILES_LIST $THEMAKEFILE"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	686
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	687 -if test x"$THEMAKEFILE" != x"$MAKEFILE" && test x"$CCAUX" = x"$CC"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	688 +if test x"$THEMAKEFILE" != x"$MAKEFILE" && test x"$build" = x"$host"; then
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	689 CONFIG_FILES_LIST="$CONFIG_FILES_LIST"
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	690 fi
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	691
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	692 diff --git a/psi/iapi.h b/psi/iapi.h
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	693 index 1111111..2222222 100644
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	694 --- a/psi/iapi.h
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	695 +++ b/psi/iapi.h
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	696 @@ -68,6 +68,11 @@ extern "C" {
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	697 # define GSDLLEXPORT
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	698 # endif
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	699 # endif
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	700 +# ifdef __MINGW32__
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	701 +/* export stdcall functions as "name" instead of "_name@ordinal" */
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	702 +# undef GSDLLAPI
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	703 +# define GSDLLAPI
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	704 +# endif
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	705 # ifndef GSDLLAPI
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	706 # define GSDLLAPI __stdcall
506a61f959e4 Update ghostscript to 9.26. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	707 # endif

Mercurial > mxe-octave

annotate src/ghostscript-1-fixes.patch @ 5895:2db7f803d55d release