c7d093f
diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.5/Magick++/bin/Magick++-config.in
c7d093f
--- ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib	2008-02-17 19:10:46.000000000 +0100
c7d093f
+++ ImageMagick-6.4.5/Magick++/bin/Magick++-config.in	2008-11-14 15:19:15.000000000 +0100
8ba8b56
@@ -7,8 +7,6 @@
8ba8b56
 
8ba8b56
 prefix=@prefix@
8ba8b56
 exec_prefix=@exec_prefix@
8ba8b56
-libdir=@libdir@
8ba8b56
-includedir=@includedir@
8ba8b56
 
8ba8b56
 usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
8ba8b56
 
8ba8b56
@@ -43,19 +41,19 @@ while test $# -gt 0; do
8ba8b56
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
8ba8b56
       ;;
8ba8b56
     --cflags)
8ba8b56
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
8ba8b56
+      pkg-config --cflags Magick++
8ba8b56
       ;;
8ba8b56
     --cxxflags)
8ba8b56
-      echo '@MAGICK_CXXFLAGS@'
8ba8b56
+      pkg-config --cflags Magick++
8ba8b56
       ;;
8ba8b56
     --cppflags)
8ba8b56
-      echo '@MAGICK_CPPFLAGS@'
8ba8b56
+      pkg-config --cflags Magick++
8ba8b56
       ;;
8ba8b56
     --ldflags)
8ba8b56
-      echo '@MAGICK_LDFLAGS@'
8ba8b56
+      pkg-config --libs Magick++
8ba8b56
       ;;
8ba8b56
     --libs)
8ba8b56
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore"
8ba8b56
+      pkg-config --libs Magick++
8ba8b56
       ;;
8ba8b56
     *)
8ba8b56
       echo "${usage}" 1>&2
c7d093f
diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/magick/Magick-config.in
c7d093f
--- ImageMagick-6.4.5/magick/Magick-config.in.multilib	2008-04-28 00:35:32.000000000 +0200
c7d093f
+++ ImageMagick-6.4.5/magick/Magick-config.in	2008-11-14 15:19:15.000000000 +0100
8ba8b56
@@ -6,8 +6,6 @@
8ba8b56
 
8ba8b56
 prefix=@prefix@
8ba8b56
 exec_prefix=@exec_prefix@
8ba8b56
-libdir=@libdir@
8ba8b56
-includedir=@includedir@/ImageMagick
8ba8b56
 
8ba8b56
 usage="\
8ba8b56
 Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
8ba8b56
@@ -40,19 +38,19 @@ while test $# -gt 0; do
8ba8b56
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
8ba8b56
       ;;
8ba8b56
     --cflags)
8ba8b56
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --cxxflags)
8ba8b56
-      echo '@MAGICK_CXXFLAGS@'
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --cppflags)
8ba8b56
-      echo '@MAGICK_CPPFLAGS@'
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --ldflags)
8ba8b56
-      echo '@MAGICK_LDFLAGS@'
8ba8b56
+      pkg-config --libs MagickCore
8ba8b56
       ;;
8ba8b56
     --libs)
c7d093f
-      echo "-L${libdir} -lMagickCore"
8ba8b56
+      pkg-config --libs MagickCore
8ba8b56
       ;;
8ba8b56
     *)
8ba8b56
       echo "${usage}" 1>&2
c7d093f
diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4.5/magick/MagickCore-config.in
c7d093f
--- ImageMagick-6.4.5/magick/MagickCore-config.in.multilib	2008-08-16 19:34:36.000000000 +0200
c7d093f
+++ ImageMagick-6.4.5/magick/MagickCore-config.in	2008-11-14 15:42:54.000000000 +0100
8ba8b56
@@ -6,8 +6,6 @@
8ba8b56
 
8ba8b56
 prefix=@prefix@
8ba8b56
 exec_prefix=@exec_prefix@
8ba8b56
-libdir=@libdir@
8ba8b56
-includedir=@includedir@/ImageMagick
8ba8b56
 
8ba8b56
 usage="\
8ba8b56
 Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
c7d093f
@@ -40,25 +38,19 @@ while test $# -gt 0; do
8ba8b56
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
8ba8b56
       ;;
8ba8b56
     --cflags)
8ba8b56
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --cxxflags)
8ba8b56
-      echo '@MAGICK_CXXFLAGS@'
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --cppflags)
8ba8b56
-      echo '@MAGICK_CPPFLAGS@'
8ba8b56
+      pkg-config --cflags MagickCore
8ba8b56
       ;;
8ba8b56
     --ldflags)
8ba8b56
-      echo '@MAGICK_LDFLAGS@'
8ba8b56
+      pkg-config --libs MagickCore
8ba8b56
       ;;
8ba8b56
     --libs)
c7d093f
-      echo "-L${libdir} -lMagickCore"
c7d093f
-      ;;
c7d093f
-    --coder-path)
c7d093f
-      echo "@CODER_PATH@"
c7d093f
-      ;;
c7d093f
-    --filter-path)
c7d093f
-      echo "@FILTER_PATH@"
8ba8b56
+      pkg-config --libs MagickCore
8ba8b56
       ;;
8ba8b56
     *)
8ba8b56
       echo "${usage}" 1>&2
c7d093f
diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/wand/MagickWand-config.in
c7d093f
--- ImageMagick-6.4.5/wand/MagickWand-config.in.multilib	2008-02-05 19:50:44.000000000 +0100
c7d093f
+++ ImageMagick-6.4.5/wand/MagickWand-config.in	2008-11-14 15:19:15.000000000 +0100
8ba8b56
@@ -6,8 +6,6 @@
8ba8b56
 
8ba8b56
 prefix=@prefix@
8ba8b56
 exec_prefix=@exec_prefix@
8ba8b56
-libdir=@libdir@
8ba8b56
-includedir=@includedir@/ImageMagick
8ba8b56
 
8ba8b56
 usage="\
8ba8b56
 Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
8ba8b56
@@ -40,19 +38,19 @@ while test $# -gt 0; do
8ba8b56
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
8ba8b56
       ;;
8ba8b56
     --cflags)
8ba8b56
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --cxxflags)
8ba8b56
-      echo '@MAGICK_CXXFLAGS@'
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --cppflags)
8ba8b56
-      echo '@MAGICK_CPPFLAGS@'
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --ldflags)
8ba8b56
-      echo '@MAGICK_LDFLAGS@'
8ba8b56
+      pkg-config --libs MagickWand
8ba8b56
       ;;
8ba8b56
     --libs)
8ba8b56
-      echo "-L${libdir} -lMagickWand -lMagickCore"
8ba8b56
+      pkg-config --libs MagickWand
8ba8b56
       ;;
8ba8b56
     *)
8ba8b56
       echo "${usage}" 1>&2
c7d093f
diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/Wand-config.in
c7d093f
--- ImageMagick-6.4.5/wand/Wand-config.in.multilib	2008-02-05 19:50:44.000000000 +0100
c7d093f
+++ ImageMagick-6.4.5/wand/Wand-config.in	2008-11-14 15:19:15.000000000 +0100
8ba8b56
@@ -6,8 +6,6 @@
8ba8b56
 
8ba8b56
 prefix=@prefix@
8ba8b56
 exec_prefix=@exec_prefix@
8ba8b56
-libdir=@libdir@
8ba8b56
-includedir=@includedir@/ImageMagick
8ba8b56
 
8ba8b56
 usage="\
8ba8b56
 Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
8ba8b56
@@ -40,19 +38,19 @@ while test $# -gt 0; do
8ba8b56
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
8ba8b56
       ;;
8ba8b56
     --cflags)
8ba8b56
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --cxxflags)
8ba8b56
-      echo '@MAGICK_CXXFLAGS@'
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --cppflags)
8ba8b56
-      echo '@MAGICK_CPPFLAGS@'
8ba8b56
+      pkg-config --cflags MagickWand
8ba8b56
       ;;
8ba8b56
     --ldflags)
8ba8b56
-      echo '@MAGICK_LDFLAGS@'
8ba8b56
+      pkg-config --libs MagickWand
8ba8b56
       ;;
8ba8b56
     --libs)
8ba8b56
-      echo "-L${libdir} -lMagickWand -lMagickCore"
8ba8b56
+      pkg-config --libs MagickWand
8ba8b56
       ;;
8ba8b56
     *)
8ba8b56
       echo "${usage}" 1>&2