Mercurial > mxe-octave

annotate src/graphicsmagick-1-fix-xml2-config.patch @ 1492:c16a0b13337d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new package: graphicsmagick
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 11 Dec 2010 22:50:57 +0100
parents
children 08774f2f7c58
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1492
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
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
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 diff -r 89c7abc7139f configure.ac
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 --- a/configure.ac Mon Dec 06 15:42:37 2010 +0100
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 +++ b/configure.ac Mon Dec 06 16:39:59 2010 +0100
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 @@ -2135,12 +2135,13 @@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 # Debian installs libxml headers under /usr/include/libxml2/libxml with
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 # the shared library installed under /usr/lib, whereas the package
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 # installs itself under $prefix/libxml and $prefix/lib.
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 - xml2_prefix=`xml2-config --prefix`
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 if test -d "${xml2_prefix}/include/libxml2"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 then
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 fi
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 + LIBS="$LIBS `"$xml2_config" --libs`"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 fi
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 failed=0
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 passed=0
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 @@ -2156,8 +2157,9 @@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 LDFLAGS="$OLD_LDFLAGS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 CPPFLAGS="$OLD_CPPFLAGS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 else
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 - LIB_XML='-lxml2'
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 + LIB_XML=`"$xml2_config" --libs`
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 LIBS="$LIB_XML $LIBS"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 + CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`"
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 AC_DEFINE(HasXML,1,Define if you have XML library)
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 AC_MSG_RESULT(yes)
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 have_xml='yes'
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 diff -r 89c7abc7139f magick/GraphicsMagick.pc.in
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
37 --- a/magick/GraphicsMagick.pc.in Mon Dec 06 15:42:37 2010 +0100
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
38 +++ b/magick/GraphicsMagick.pc.in Mon Dec 06 16:39:59 2010 +0100
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
39 @@ -8,4 +8,5 @@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
40 Version: @PACKAGE_VERSION@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
41 Description: GraphicsMagick image processing library
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
42 Libs: -L${libdir} -lGraphicsMagick
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
43 +Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
c16a0b13337d new package: graphicsmagick
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
44 Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@