Mercurial > mxe-octave

annotate src/graphicsmagick-1-fix-xml2-config.patch @ 3568:f44dd0186692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native unixy builds of openblas to work on 64-bit systems
author John W. Eaton <jwe@octave.org>
date Wed, 19 Mar 2014 12:38:42 -0400
parents c9b15d4d4f7d
children fb311137f2f4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2258
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from:
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://sourceforge.net/tracker/?func=detail&aid=3130497&group_id=73485&atid=537937
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6
2258
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
7 diff --git a/configure.ac b/configure.ac
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
8 index 979d2c4..12d4555 100755
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
9 --- a/configure.ac
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
10 +++ b/configure.ac
2823
c9b15d4d4f7d update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2629
diff changeset
11 @@ -2373,12 +2373,13 @@ then
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 # Debian installs libxml headers under /usr/include/libxml2/libxml with
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 # the shared library installed under /usr/lib, whereas the package
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 # installs itself under $prefix/libxml and $prefix/lib.
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 - xml2_prefix=`xml2-config --prefix`
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 + xml2_prefix=`"$xml2_config" --prefix`
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 if test -d "${xml2_prefix}/include/libxml2"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 then
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 fi
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 + LIBS="$LIBS `"$xml2_config" --libs`"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 fi
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 failed=0
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 passed=0
2823
c9b15d4d4f7d update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2629
diff changeset
26 @@ -2401,8 +2402,9 @@ then
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 LDFLAGS="$OLD_LDFLAGS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 CPPFLAGS="$OLD_CPPFLAGS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 else
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 - LIB_XML='-lxml2'
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 + LIB_XML=`"$xml2_config" --libs`
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 LIBS="$LIB_XML $LIBS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 + CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 AC_DEFINE(HasXML,1,Define if you have XML library)
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 AC_MSG_RESULT(yes)
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 have_xml='yes'
2258
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
37 diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
38 index 5757b37..87e3fd4 100644
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
39 --- a/magick/GraphicsMagick.pc.in
08774f2f7c58 update package graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 1492
diff changeset
40 +++ b/magick/GraphicsMagick.pc.in
2629
5b3e0a7b7880 package graphicsmagick: fix dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
41 @@ -8,4 +8,6 @@ Name: GraphicsMagick
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
42 Version: @PACKAGE_VERSION@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
43 Description: GraphicsMagick image processing library
2629
5b3e0a7b7880 package graphicsmagick: fix dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
44 +Requires.private: libxml-2.0
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
45 Libs: -L${libdir} -lGraphicsMagick
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
46 +Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
47 Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@