(no commit message)

diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in
index 06c6c381f648049c03f9850eb652a3feb1c89f1a..b1bffaf8e2058881eb71ffb73e95eaeb66c871af 100755 (executable)
--- a/Magick++/bin/Magick++-config.in
+++ b/Magick++/bin/Magick++-config.in
@@ -7,8 +7,6 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
 
 usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
 
@@ -43,19 +41,19 @@ while test $# -gt 0; do
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
       ;;
     --cflags)
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
+      pkg-config --cflags Magick++
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags Magick++
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags Magick++
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs Magick++
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@"
+      pkg-config --libs Magick++
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/MagickCore/MagickCore-config.in b/MagickCore/MagickCore-config.in
index 6020f8b06ffce468ef06fafc48d40ccf6dcc153e..582db713526952fec7b269a260a6ec197a748f60 100644 (file)
--- a/MagickCore/MagickCore-config.in
+++ b/MagickCore/MagickCore-config.in
@@ -6,8 +6,6 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
 
 usage="\
 Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
       ;;
     --cflags)
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
+      pkg-config --cflags MagickCore
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags MagickCore
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags MagickCore
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs MagickCore
       ;;
     --libs)
-      echo "-L${libdir} @MAGICK_LIBS@"
+      pkg-config --libs MagickCore
       ;;
     --coder-path)
       echo "@CODER_PATH@"

diff --git a/MagickWand/MagickWand-config.in b/MagickWand/MagickWand-config.in
index f6f2195c4e640e65c8646d2c4989959b167a6610..f29b023392b8999cd470e7ea14733bc635dd18ae 100644 (file)
--- a/MagickWand/MagickWand-config.in
+++ b/MagickWand/MagickWand-config.in
@@ -6,8 +6,6 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
 
 usage="\
 Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
       ;;
     --cflags)
-      echo "-I${includedir} @MAGICK_PCFLAGS@"
+      pkg-config --cflags MagickWand
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags MagickWand
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags MagickWand
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs MagickWand
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
+      pkg-config --libs MagickWand
       ;;
     *)
       echo "${usage}" 1>&2