Mercurial > mxe-octave

annotate src/pstoedit-2-gs.patch @ 3725:2acaa9943159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents 7bccd055043e
children ea3cab4018c5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3123
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur pstoedit-3.61-orig/configure.ac pstoedit-3.61/configure.ac
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- pstoedit-3.61-orig/configure.ac 2012-08-28 06:46:41 -0400
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ pstoedit-3.61/configure.ac 2013-07-05 23:29:38 -0400
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -53,12 +53,12 @@
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 dnl Check Ghostscript
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 GS=""
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 AC_PATH_PROG(GS,gs)
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 -if test -z "${GS}"; then
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 - AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.])
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 -else
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 -dnl Strip off // to / that causes troubles.
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 - GS=`echo $GS | sed -e 's/\/\//\//g'`
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 -fi
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 +dnl if test -z "${GS}"; then
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.])
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 +dnl else
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 +dnl dnl Strip off // to / that causes troubles.
3608
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
18 +dnl GS=`echo $GS | sed -e 's/\/\//\//g'`
3123
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 +dnl fi
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 PKG_PROG_PKG_CONFIG
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22
3608
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
23 diff -ur pstoedit-3.62.orig/src/Makefile.am pstoedit-3.62/src/Makefile.am
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
24 --- pstoedit-3.62.orig/src/Makefile.am 2014-06-03 12:53:10 -0400
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
25 +++ pstoedit-3.62/src/Makefile.am 2014-06-03 12:54:14 -0400
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
26 @@ -31,7 +31,7 @@
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
27 ${LIBMAGICK_CFLAGS} \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
28 ${LIBEMF_CFLAGS} \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
29 ${LIBPNG_CFLAGS} \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
30 - -DDEFAULTGS=$(GS) \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
31 + -DDEFAULTGS="\"$(GS)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
32 -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
33 -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
34 ${SPECIAL_CXXFLAGS}