Mark Brand
5 years ago
parent
eaf3d68393
commit
d367e3b2c4
@ -1,46 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
This patch has been taken from:
|
||||
https://sourceforge.net/p/graphicsmagick/bugs/154/
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 979d2c4..12d4555 100755
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2373,12 +2373,13 @@ then
|
||||
# Debian installs libxml headers under /usr/include/libxml2/libxml with
|
||||
# the shared library installed under /usr/lib, whereas the package
|
||||
# installs itself under $prefix/libxml and $prefix/lib.
|
||||
- xml2_prefix=`xml2-config --prefix`
|
||||
+ xml2_prefix=`"$xml2_config" --prefix`
|
||||
if test -d "${xml2_prefix}/include/libxml2"
|
||||
then
|
||||
CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
|
||||
fi
|
||||
LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
|
||||
+ LIBS="$LIBS `"$xml2_config" --libs`"
|
||||
fi
|
||||
failed=0
|
||||
passed=0
|
||||
@@ -2401,8 +2402,9 @@ then
|
||||
LDFLAGS="$OLD_LDFLAGS"
|
||||
CPPFLAGS="$OLD_CPPFLAGS"
|
||||
else
|
||||
- LIB_XML='-lxml2'
|
||||
+ LIB_XML=`"$xml2_config" --libs`
|
||||
LIBS="$LIB_XML $LIBS"
|
||||
+ CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`"
|
||||
AC_DEFINE(HasXML,1,Define if you have XML library)
|
||||
AC_MSG_RESULT(yes)
|
||||
have_xml='yes'
|
||||
diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in
|
||||
index 5757b37..87e3fd4 100644
|
||||
--- a/magick/GraphicsMagick.pc.in
|
||||
+++ b/magick/GraphicsMagick.pc.in
|
||||
@@ -8,4 +8,6 @@ Name: GraphicsMagick
|
||||
Version: @PACKAGE_VERSION@
|
||||
Description: GraphicsMagick image processing library
|
||||
+Requires.private: libxml-2.0
|
||||
Libs: -L${libdir} -lGraphicsMagick
|
||||
+Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
|
||||
Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@
|
||||
@ -0,0 +1,44 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Volker Diels-Grabsch <v@njh.eu>
|
||||
Date: Sat, 11 Dec 2010 22:50:57 +0100
|
||||
Subject: [PATCH 1/2] fix .pc file for xml2 dependency
|
||||
|
||||
This patch has been taken from:
|
||||
https://sourceforge.net/p/graphicsmagick/bugs/154/
|
||||
|
||||
diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/magick/GraphicsMagick.pc.in
|
||||
+++ b/magick/GraphicsMagick.pc.in
|
||||
@@ -7,5 +7,7 @@ includedir=@includedir@/GraphicsMagick
|
||||
Name: GraphicsMagick
|
||||
Version: @PACKAGE_VERSION@
|
||||
Description: GraphicsMagick image processing library
|
||||
+Requires.private: libxml-2.0
|
||||
Libs: -L${libdir} -lGraphicsMagick
|
||||
+Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
|
||||
Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sun, 10 Feb 2013 15:24:58 +1100
|
||||
Subject: [PATCH 2/2] relax autoconf version requirement
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1111111..2222222 100755
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -11,7 +11,7 @@
|
||||
# Written by Bob Friesenhahn <bfriesen@GraphicsMagick.org>
|
||||
#
|
||||
|
||||
-AC_PREREQ(2.69)
|
||||
+AC_PREREQ(2.67)
|
||||
AC_INIT(magick/magick.h)
|
||||
|
||||
# Specify directory where m4 macros may be found.
|
||||
@ -1,14 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -11,7 +11,7 @@
|
||||
# Written by Bob Friesenhahn <bfriesen@GraphicsMagick.org>
|
||||
#
|
||||
|
||||
-AC_PREREQ(2.69)
|
||||
+AC_PREREQ(2.67)
|
||||
AC_INIT(magick/magick.h)
|
||||
|
||||
# Specify directory where m4 macros may be found.
|
||||
Loading…
Reference in new issue