From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 15 Jun 2013 19:42:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=193498e13019e94b01d0963607b36958cbc6dea5;p=imagemagick

---

diff --git a/Magick++/lib/Magick++.pc.in b/Magick++/lib/Magick++.pc.in
index 5892767dc..7f40e5270 100644
--- 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 c7abb05ab..4da7b980c 100644
--- 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 dc9acb29b..9ec5b3002 100644
--- 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 579fde23d..e0771336b 100644
--- 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 53be17fe9..50e428557 100644
--- 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 15ec85fe5..db3f47414 100755
--- 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