(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d5489f69b6ff2a26b68c80f10bf60c66f47e3850..165ac912443b6a695710c11549b64a66f14218a0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9237:9267M"
+#define MagickSVNRevision  "9270:9273M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/MagickWand/MagickWand-config.1 b/MagickWand/MagickWand-config.1
new file mode 100644 (file)
index 0000000..60892ca
--- /dev/null
+++ b/MagickWand/MagickWand-config.1
@@ -0,0 +1,69 @@
+.ad l
+.nh
+.TH MagickWand-Config 1 "2 May 2002" "Wand"
+.SH NAME
+MagickWand-config \- get information about the installed version of the Magick Wand
+.SH SYNOPSIS
+.B MagickWand-config 
+.B [--cflags]
+.B [--cppflags]
+.B [--exec-prefix]
+.B [--ldflags]
+.B [--libs]
+.B [--prefix]
+.B [--version]
+.SH DESCRIPTION
+.B MagickWand-config
+prints the compiler and linker flags required to compile and link programs
+that use the
+.BR Wand
+Application Programmer Interface.
+.SH EXAMPLES
+To print the version of the installed distribution of
+.BR Wand ,
+use:
+
+.nf
+  MagickWand-config \-\-version
+.fi
+  
+To compile a program that calls the 
+.BR Wand
+Application Programmer Interface, use:
+
+.nf
+  cc `MagickWand-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c
+.fi
+
+.SH OPTIONS
+.TP
+.B \-\-cflags
+Print the compiler flags that were used to compile 
+.BR libWand .
+.TP
+.B \-\-cppflags
+Print the preprocessor flags that are needed to find the
+.B Wand
+C include files and defines to ensure that the Wand data structures match between
+your program and the installed libraries.
+.TP
+.B \-\-exec-prefix
+Print the directory under which target specific binaries and executables are installed.
+.TP
+.B \-\-ldflags
+Print the linker flags that are needed to link with the
+.B Wand
+library.
+.TP
+.B \-\-libs
+Print the linker flags that are needed to link a program with
+.BR libWand .
+.TP
+.B \-\-version
+Print the version of the
+.B Wand
+distribution to standard output.
+.SH COPYRIGHT
+See http://www.imagemagick.org/script/license.php
+.SH AUTHORS
+John Cristy, ImageMagick Studio LLC

diff --git a/configure b/configure
index b2f144eb4b78a57bb6df85dac81529d7a1d2a179..b4f8d45bef509fe30d7fda8c34f1e56292d7f504 100755 (executable)
--- a/configure
+++ b/configure
@@ -3666,7 +3666,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9237:9267M
+MAGICK_SVN_REVISION=9270:9273M