(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index ccf9cb760e84a9ba38c2f3c0cd88163b1450a4f2..efc89ca1c8e977f0d683b982525ef9e9c21127d1 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15015:15020M"
+#define MagickSVNRevision  "15035M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-03-04"
+#define MagickReleaseDate  "2014-03-06"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/Makefile.am b/Makefile.am
index 8ceec48f85d1cc2ad7309801939881b5d5594aaa..b0b0a6a5879cfcf38107f88e014c837631128311 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,9 +171,6 @@ doc_DATA = \
        LICENSE \
        ChangeLog \
        NEWS.txt
-else
-man_MANS =
-doc_DATA =
 endif
 
 if MAINTAINER_MODE
@@ -251,9 +248,7 @@ DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 
 if INSTALL_DOC
 HTML_INSTALL_DATA_TARGETS = install-data-html
-else !INSTALL_DOC
-HTML_INSTALL_DATA_TARGETS =
-endif !INSTALL_DOC
+endif
 
 install-data-html:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)

diff --git a/Makefile.in b/Makefile.in
index bca1bf6c98448caa20bffeeb75bd0bfd36f1cc9b..ffdbaefc60926f6caa7e4b533fb8c8ac19b60c87 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5077,7 +5077,6 @@ pkgconfig_DATA = \
        $(MAGICKWAND_PKGCONFIG) \
        $(MAGICKPP_PKGCONFIG)
 
-@INSTALL_DOC_FALSE@man_MANS = 
 
 # Manual pages to install
 @INSTALL_DOC_TRUE@man_MANS = \
@@ -5086,7 +5085,6 @@ pkgconfig_DATA = \
 @INSTALL_DOC_TRUE@     $(MAGICKPP_MANS) \
 @INSTALL_DOC_TRUE@     $(UTILITIES_MANS)
 
-@INSTALL_DOC_FALSE@doc_DATA = 
 @INSTALL_DOC_TRUE@doc_DATA = \
 @INSTALL_DOC_TRUE@     LICENSE \
 @INSTALL_DOC_TRUE@     ChangeLog \
@@ -5110,7 +5108,6 @@ pkgdocdir = $(DOCUMENTATION_PATH)
 DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand
 DOCDIRSMANUAL = images images/patterns www www/api www/source www/Magick++
 DOCDIRS = $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
-@INSTALL_DOC_FALSE@HTML_INSTALL_DATA_TARGETS = 
 @INSTALL_DOC_TRUE@HTML_INSTALL_DATA_TARGETS = install-data-html
 
 # Uninstall HTML files

diff --git a/configure b/configure
index 71ea86e5ea37a61a218945f8ed42f4243b74c7c0..16ddf164e7720dd3cda376fb987fc669426dd5e8 100755 (executable)
--- a/configure
+++ b/configure
@@ -3702,7 +3702,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15015:15020M
+MAGICK_SVN_REVISION=15035M
 
 
 # Substitute library versioning
@@ -32680,10 +32680,10 @@ _ACEOF
 if test "${enable_docs+set}" = set; then :
   enableval=$enable_docs; wantdocs=$enableval
 else
-  wantdocs=detect
+  wantdocs=yes
 fi
 
- if test "$wantdocs" = "xyes"; then
+ if test "$wantdocs" = "yes"; then
   INSTALL_DOC_TRUE=
   INSTALL_DOC_FALSE='#'
 else

diff --git a/configure.ac b/configure.ac
index 315d354a509e6e539a995fcd2a463e25d5a78ca8..a251471e3f2c5e823edf0fd8eb61625040a1157b 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3176,8 +3176,8 @@ AC_SUBST(DOCUMENTATION_PATH)
 AC_ARG_ENABLE([docs],
   [AS_HELP_STRING([--disable-docs],
     [disable building of documentation])],
-  wantdocs=$enableval, wantdocs=detect)
-AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "xyes"])
+  wantdocs=$enableval, wantdocs=yes)
+AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
 
 # Subdirectory to place architecture-dependent configuration files
 CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"