From: cristy Date: Wed, 5 Mar 2014 02:06:32 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2615 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd17febf00ffbdcc42ce6b12c67eedfb248ba4e5;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index 72a8cd21a..ccf9cb760 100644 --- 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:15016M" +#define MagickSVNRevision "15015:15020M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 diff --git a/Makefile.am b/Makefile.am index 229f75801..8ceec48f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,19 +156,25 @@ pkgconfig_DATA = \ %-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc cp -f $^ $@ +# Architecture independent data files installed in the package's data directory +docdir = $(DOCUMENTATION_PATH) + # Manual pages to install +if INSTALL_DOC# man_MANS = \ $(MAGICKCORE_MANS) \ $(MAGICKWAND_MANS) \ $(MAGICKPP_MANS) \ $(UTILITIES_MANS) -# Architecture independent data files installed in the package's data directory -docdir = $(DOCUMENTATION_PATH) doc_DATA = \ LICENSE \ ChangeLog \ NEWS.txt +else +man_MANS = +doc_DATA = +endif if MAINTAINER_MODE MAINTAINER_TARGETS = \ @@ -242,7 +248,13 @@ pkgdocdir = $(DOCUMENTATION_PATH) DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand DOCDIRSMANUAL = images images/patterns www www/api www/source www/Magick++ DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN) + +if INSTALL_DOC HTML_INSTALL_DATA_TARGETS = install-data-html +else !INSTALL_DOC +HTML_INSTALL_DATA_TARGETS = +endif !INSTALL_DOC + install-data-html: $(mkinstalldirs) $(DESTDIR)$(pkgdocdir) $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(pkgdocdir) diff --git a/Makefile.in b/Makefile.in index 8ec4af596..bca1bf6c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5077,18 +5077,20 @@ pkgconfig_DATA = \ $(MAGICKWAND_PKGCONFIG) \ $(MAGICKPP_PKGCONFIG) +@INSTALL_DOC_FALSE@man_MANS = # Manual pages to install -man_MANS = \ - $(MAGICKCORE_MANS) \ - $(MAGICKWAND_MANS) \ - $(MAGICKPP_MANS) \ - $(UTILITIES_MANS) - -doc_DATA = \ - LICENSE \ - ChangeLog \ - NEWS.txt +@INSTALL_DOC_TRUE@man_MANS = \ +@INSTALL_DOC_TRUE@ $(MAGICKCORE_MANS) \ +@INSTALL_DOC_TRUE@ $(MAGICKWAND_MANS) \ +@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 \ +@INSTALL_DOC_TRUE@ NEWS.txt @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \ @MAINTAINER_MODE_TRUE@ magick-version \ @@ -5108,7 +5110,8 @@ pkgdocdir = $(DOCUMENTATION_PATH) DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand DOCDIRSMANUAL = images images/patterns www www/api www/source www/Magick++ DOCDIRS = $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN) -HTML_INSTALL_DATA_TARGETS = install-data-html +@INSTALL_DOC_FALSE@HTML_INSTALL_DATA_TARGETS = +@INSTALL_DOC_TRUE@HTML_INSTALL_DATA_TARGETS = install-data-html # Uninstall HTML files HTML_UNINSTALL_DATA_TARGETS = uninstall-data-html @@ -11199,6 +11202,7 @@ dist-hook: done \ ) \ ) + install-data-html: $(mkinstalldirs) $(DESTDIR)$(pkgdocdir) $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(pkgdocdir) diff --git a/configure b/configure index 572f6f1ef..71ea86e5e 100755 --- a/configure +++ b/configure @@ -739,6 +739,8 @@ SHAREARCH_DIRNAME SHAREARCH_BASEDIRNAME SHARE_PATH CONFIGURE_PATH +INSTALL_DOC_FALSE +INSTALL_DOC_TRUE DOCUMENTATION_PATH FILTER_PATH FILTER_DIRNAME @@ -1196,6 +1198,7 @@ with_webp with_windows_font_dir with_wmf with_xml +enable_docs ' ac_precious_vars='build_alias host_alias @@ -1900,6 +1903,7 @@ Optional Features: --enable-gcov enable 'gcov' profiling support --enable-legacy-support install legacy command-line utilities (default disabled) --disable-assert turn off assertions + --disable-docs disable building of documentation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3698,7 +3702,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=15015:15016M +MAGICK_SVN_REVISION=15015:15020M # Substitute library versioning @@ -32670,6 +32674,24 @@ _ACEOF +# +# Enable/Disable documentation +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then : + enableval=$enable_docs; wantdocs=$enableval +else + wantdocs=detect +fi + + if test "$wantdocs" = "xyes"; then + INSTALL_DOC_TRUE= + INSTALL_DOC_FALSE='#' +else + INSTALL_DOC_TRUE='#' + INSTALL_DOC_FALSE= +fi + + # Subdirectory to place architecture-dependent configuration files CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" @@ -36273,6 +36295,10 @@ if test -z "${XML_DELEGATE_TRUE}" && test -z "${XML_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"XML_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INSTALL_DOC_TRUE}" && test -z "${INSTALL_DOC_FALSE}"; then + as_fn_error $? "conditional \"INSTALL_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${RPM_DELEGATE_TRUE}" && test -z "${RPM_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"RPM_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 420f76e9a..315d354a5 100755 --- a/configure.ac +++ b/configure.ac @@ -3171,6 +3171,14 @@ esac AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory where ImageMagick documents live.]) AC_SUBST(DOCUMENTATION_PATH) +# +# Enable/Disable documentation +AC_ARG_ENABLE([docs], + [AS_HELP_STRING([--disable-docs], + [disable building of documentation])], + wantdocs=$enableval, wantdocs=detect) +AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "xyes"]) + # Subdirectory to place architecture-dependent configuration files CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])