(no commit message)

diff --git a/Magick++/lib/Magick++.pc.in b/Magick++/lib/Magick++.pc.in
index 5892767dc42984e1b3dde6160fd9203f52a398ee..7f40e52701ea4354a5acbcbf0aeeb35fb9f83465 100644 (file)
--- a/Magick++/lib/Magick++.pc.in
+++ b/Magick++/lib/Magick++.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
 libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
  
 Name: Magick++
@@ -10,4 +11,4 @@ Version: @PACKAGE_VERSION@
 Requires: MagickWand
 Libs: -L${libdir} -l${libname}
 Libs.private: -L${libdir} -l${libname} @MATH_LIBS@
-Cflags: -I${includedir} @MAGICK_PCFLAGS@
+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

diff --git a/MagickCore/ImageMagick.pc.in b/MagickCore/ImageMagick.pc.in
index c7abb05ab6397ebdc91ff22e086d8fa26af4bea8..4da7b980c2517138ed1d99096076d46395a7f528 100644 (file)
--- a/MagickCore/ImageMagick.pc.in
+++ b/MagickCore/ImageMagick.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
 libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
  
 Name: ImageMagick
@@ -9,4 +10,4 @@ Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABI_SU
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -l${libname}
 Libs.private: -L${libdir} -l${libname} @MATH_LIBS@
-Cflags: -I${includedir} @MAGICK_PCFLAGS@
+Cflags:  -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

diff --git a/MagickCore/MagickCore.pc.in b/MagickCore/MagickCore.pc.in
index dc9acb29b502aa3b44ed4a24090fc77210007dec..9ec5b3002fabdd89cafe529d071718fd67754d5f 100644 (file)
--- a/MagickCore/MagickCore.pc.in
+++ b/MagickCore/MagickCore.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
 libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
 moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
  
@@ -10,4 +11,4 @@ Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -l${libname}
 Libs.private: -L${libdir} -l${libname} @MATH_LIBS@
-Cflags: -I${includedir} @MAGICK_PCFLAGS@
+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 579fde23d93a1fcf0d75ee0054af645316f97744..e0771336b10f109679a0d0e617ad58116b361006 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12412:12442M"
+#define MagickSVNRevision  "12412:12463M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-06-12"
+#define MagickReleaseDate  "2013-06-15"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/MagickWand.pc.in b/MagickWand/MagickWand.pc.in
index 53be17fe94b4fc21e3a878eb07f2d459490881d5..50e42855764e935010d69d3c6325ded34e79b1e7 100644 (file)
--- a/MagickWand/MagickWand.pc.in
+++ b/MagickWand/MagickWand.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
 libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
  
 Name: MagickWand
@@ -10,4 +11,4 @@ Version: @PACKAGE_VERSION@
 Requires: MagickCore
 Libs: -L${libdir} -l${libname}
 Libs.private: -L${libdir} -l${libname} @MATH_LIBS@
-Cflags: -I${includedir} @MAGICK_PCFLAGS@
+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

diff --git a/configure b/configure
index 15ec85fe530096454e51cd8e4f4d8a511b5ef527..db3f47414766e89e210eec6901a6c3301ff24739 100755 (executable)
--- a/configure
+++ b/configure
@@ -3679,7 +3679,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12412:12442M
+MAGICK_SVN_REVISION=12412:12463M
 
 
 # Substitute library versioning