From: cristy Date: Mon, 4 Mar 2013 17:43:36 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4144 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdabdd6980b1ce64436f7d195566f45a71e07e12;p=imagemagick --- diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index 0cec68d8c..3f71814b3 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -1,6 +1,5 @@ %global VERSION @PACKAGE_VERSION@ %global MAJOR_VERSION @MAGICK_MAJOR_VERSION@ -%global MINOR_VERSION @MAGICK_MINOR_VERSION@ %global Patchlevel @PACKAGE_RELEASE@ Name: @PACKAGE_NAME@ @@ -178,7 +177,7 @@ make rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" -cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION} +cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{MAJOR_VERSION} rm %{buildroot}%{_libdir}/*.la # fix weird perl Magick.so permissions @@ -212,10 +211,10 @@ fi %define wordsize 32 %endif -mv %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config.h \ - %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config-%{wordsize}.h +mv %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config.h \ + %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config-%{wordsize}.h -cat >%{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config.h <%{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config.h < + @%:@ifndef LLONG_MAX + @%:@ define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + @%:@ define LLONG_MAX (HALF - 1 + HALF) + @%:@endif]], + [[long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0;]])], + [ac_cv_type_long_long_int=yes], + [ac_cv_type_long_long_int=no], + [ac_cv_type_long_long_int=yes])], + [ac_cv_type_long_long_int=no])]) + if test $ac_cv_type_long_long_int = yes; then + AC_DEFINE([HAVE_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `long long int'.]) + fi +]) + +# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. +# This fixes a bug in Autoconf 2.61, but can be removed once we +# assume 2.62 everywhere. + +# Note: If the type 'unsigned long long int' exists but is only 32 bits +# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT +# will not be defined. In this case you can treat 'unsigned long long int' +# like 'unsigned long int'. + +AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], +[ + AC_CACHE_CHECK([for unsigned long long int], + [ac_cv_type_unsigned_long_long_int], + [AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [ac_cv_type_unsigned_long_long_int=yes], + [ac_cv_type_unsigned_long_long_int=no])]) + if test $ac_cv_type_unsigned_long_long_int = yes; then + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `unsigned long long int'.]) + fi +]) + +# Expands to a C program that can be used to test for simultaneous support +# of 'long long' and 'unsigned long long'. We don't want to say that +# 'long long' is available if 'unsigned long long' is not, or vice versa, +# because too many programs rely on the symmetry between signed and unsigned +# integer types (excluding 'bool'). +AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], +[ + AC_LANG_PROGRAM( + [[/* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63;]], + [[/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull));]]) +]) + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/configure b/configure index 2a5ac21fa..e7c62d102 100755 --- a/configure +++ b/configure @@ -1924,10 +1924,10 @@ Optional Packages: --without-fpx disable FlashPIX support --without-fontconfig disable fontconfig support --without-freetype disable Freetype support - --without-gslib enable Ghostscript library support + --with-gslib enable Ghostscript library support --with-fontpath=DIR prepend to default font search path --with-gs-font-dir=DIR Ghostscript font directory - --with-gvc disable GVC support + --with-gvc enable GVC support --without-jbig disable JBIG support --without-jpeg disable JPEG support --without-jp2 disable JPEG-2000 support @@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11115:11203M +MAGICK_SVN_REVISION=11231:11245M # Substitute library versioning @@ -3681,8 +3681,6 @@ MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MA - - # Ensure that make can run correctly { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } @@ -22452,29 +22450,27 @@ _ACEOF esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if ${ac_cv_type_unsigned_long_long_int+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if ${ac_cv_type_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ /* Test literals. */ long long int ll = 9223372036854775807ll; long long int nll = -9223372036854775807LL; unsigned long long int ull = 18446744073709551615ULL; /* Test constant expressions. */ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; + ? 1 : -1)]; typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; + ? 1 : -1)]; int i = 63; int main () @@ -22483,73 +22479,46 @@ main () long long int llmax = 9223372036854775807ll; unsigned long long int ullmax = 18446744073709551615ull; return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - -else - ac_cv_type_unsigned_long_long_int=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } - if test $ac_cv_type_unsigned_long_long_int = yes; then - -$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h - - fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if ${ac_cv_type_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test "$cross_compiling" = yes; then : ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : - : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - + ac_cv_type_long_long_int=yes else ac_cv_type_long_long_int=no fi @@ -22557,8 +22526,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - fi +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 $as_echo "$ac_cv_type_long_long_int" >&6; } @@ -22718,47 +22690,75 @@ $as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 $as_echo_n "checking for long long int... " >&6; } if ${ac_cv_type_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "$cross_compiling" = yes; then : ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : - : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - + ac_cv_type_long_long_int=yes else ac_cv_type_long_long_int=no fi @@ -22766,8 +22766,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - fi +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 $as_echo "$ac_cv_type_long_long_int" >&6; } @@ -22952,6 +22955,60 @@ _ACEOF esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if ${ac_cv_type_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_unsigned_long_long_int=yes +else + ac_cv_type_unsigned_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h + + fi + + ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "$ac_includes_default" if test "x$ac_cv_type_uintmax_t" = xyes; then : @@ -23013,24 +23070,22 @@ $as_echo_n "checking for unsigned long long int... " >&6; } if ${ac_cv_type_unsigned_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ /* Test literals. */ long long int ll = 9223372036854775807ll; long long int nll = -9223372036854775807LL; unsigned long long int ull = 18446744073709551615ULL; /* Test constant expressions. */ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; + ? 1 : -1)]; typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; + ? 1 : -1)]; int i = 63; int main () @@ -23039,22 +23094,21 @@ main () long long int llmax = 9223372036854775807ll; unsigned long long int ullmax = 18446744073709551615ull; return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - + ac_cv_type_unsigned_long_long_int=yes else ac_cv_type_unsigned_long_long_int=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } @@ -25986,7 +26040,7 @@ fi # Assume that delegate headers reside under same directory as ImageMagick # installation prefix. -MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION.$MAGICK_MINOR_VERSION $MAGICK_CPPFLAGS" +MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS" # # Find the X11 RGB database @@ -32276,7 +32330,7 @@ fi # # Path to ImageMagick header files -INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}" DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/" case "${build_os}" in @@ -32408,7 +32462,7 @@ FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}" # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in @@ -32424,7 +32478,7 @@ _ACEOF # Subdirectory to place architecture-dependent configuration files -CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" cat >>confdefs.h <<_ACEOF #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH" @@ -32445,7 +32499,7 @@ _ACEOF # Subdirectory to place architecture-independent configuration files -SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" cat >>confdefs.h <<_ACEOF #define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH" diff --git a/configure.ac b/configure.ac index f02d42c63..b5fae9537 100755 --- a/configure.ac +++ b/configure.ac @@ -1266,7 +1266,7 @@ fi # Assume that delegate headers reside under same directory as ImageMagick # installation prefix. -MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION.$MAGICK_MINOR_VERSION $MAGICK_CPPFLAGS" +MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS" # # Find the X11 RGB database @@ -2953,7 +2953,7 @@ AC_SUBST(PERLMAINCC) # # Path to ImageMagick header files -INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}" DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/" case "${build_os}" in @@ -3049,7 +3049,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in @@ -3061,7 +3061,7 @@ AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory wh AC_SUBST(DOCUMENTATION_PATH) # Subdirectory to place architecture-dependent configuration files -CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +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.]) CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/" DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/" @@ -3074,7 +3074,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where arch AC_SUBST(CONFIGURE_PATH) # Subdirectory to place architecture-independent configuration files -SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",[Subdirectory of lib where architecture-independent configuration files live.]) SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index e37e9f610..7e4cf073a 100644 --- a/utilities/ImageMagick.1 +++ b/utilities/ImageMagick.1 @@ -86,9 +86,9 @@ saves any visible window on an X server and outputs it as an image file. You can interprets and executes scripts written in the Magick Scripting Language (MSL). .PP -For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. .SH SEE ALSO convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index 49005f1ba..4800181c7 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server. .SH OVERVIEW The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server. -For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/animate.html or http://www.imagemagick.org/script/animate.php. +For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -93,4 +93,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index 026b20109..a9373f6b6 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image .SH OVERVIEW The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction. -For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/compare.html or http://www.imagemagick.org/script/compare.php. +For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -66,4 +66,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index 6459c5e64..254722c00 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -7,7 +7,7 @@ composite \- overlaps one image over another. .SH OVERVIEW The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another. -For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/composite.html or http://www.imagemagick.org/script/composite.php. +For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. .SH DESCRIPTION Image Settings: \-affine matrix affine transform matrix @@ -103,4 +103,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index 750844087..d1fa0c63f 100644 --- a/utilities/conjure.1 +++ b/utilities/conjure.1 @@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu .SH OVERVIEW The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. -For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/conjure.html or http://www.imagemagick.org/script/conjure.php. +For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php. .SH DESCRIPTION Image Settings: \-monitor monitor progress @@ -31,4 +31,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index 2daf790c1..6eb0d6a64 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop, .SH OVERVIEW The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. -For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/convert.html or http://www.imagemagick.org/script/convert.php. +For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -282,4 +282,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index baf018e5d..9c2f239d4 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server. .SH OVERVIEW The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server. -For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/display.html or http://www.imagemagick.org/script/display.php. +For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -129,4 +129,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index a67ad73f2..17c13133b 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files. .SH OVERVIEW The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. -For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/identify.html or http://www.imagemagick.org/script/identify.php. +For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -65,4 +65,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index f2f331ac6..5e27f5f43 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil .SH OVERVIEW The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. -For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/import.html or http://www.imagemagick.org/script/import.php. +For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -94,4 +94,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 57d2e66e5..fe314c2c5 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, .SH OVERVIEW The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. -For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. +For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -281,4 +281,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index 86facad16..d85a08950 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im .SH OVERVIEW The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. -For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/montage.html or http://www.imagemagick.org/script/montage.php. +For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -131,4 +131,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index 1045b530b..b99d7f487 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image .SH OVERVIEW \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. -For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/www/stream.html or http://www.imagemagick.org/script/stream.php. +For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -54,4 +54,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP