From 5ed9c6e92d0c40e6098b84455c9f76f534967f19 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 14 Jul 2013 21:20:31 +0000 Subject: [PATCH] --- Magick++/Makefile.am | 2 +- Magick++/lib/libMagick++.map | 2 +- MagickCore/magick-baseconfig.h | 8 +- MagickCore/version.h | 9 +- MagickCore/version.h.in | 5 ++ Makefile.in | 9 +- PerlMagick/Makefile.PL | 2 +- PerlMagick/quantum/Makefile.PL | 2 +- aclocal.m4 | 114 +++++++++++++++++++++++++ config/config.h.in | 4 +- configure | 148 +++++++++++++++++++++------------ configure.ac | 34 ++++++++ version.sh | 5 ++ 13 files changed, 276 insertions(+), 68 deletions(-) diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am index 46284d4b6..ef323303e 100644 --- a/Magick++/Makefile.am +++ b/Magick++/Makefile.am @@ -137,7 +137,7 @@ endif Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \ $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \ -version-info \ - $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) + $(MAGICKPP_LIBRARY_CURRENT):$(MAGICKPP_LIBRARY_REVISION):$(MAGICKPP_LIBRARY_AGE) Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) MAGICKPP_CHECK_PGRMS_OPT = \ diff --git a/Magick++/lib/libMagick++.map b/Magick++/lib/libMagick++.map index 547d02ff0..be42d8293 100644 --- a/Magick++/lib/libMagick++.map +++ b/Magick++/lib/libMagick++.map @@ -1,4 +1,4 @@ - VERS_1.0 { + VERS_2.0 { global: *; }; diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 4e9aed84c..b6439efa5 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -37,7 +37,7 @@ /* Directory where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_PATH -#define MAGICKCORE_CONFIGURE_PATH "/etc/ImageMagick-7/" +#define MAGICKCORE_CONFIGURE_PATH "/usr/etc/ImageMagick-7/" #endif /* Subdirectory of lib where architecture-dependent configuration files live. @@ -420,7 +420,7 @@ #define MAGICKCORE_HAVE_LONG_DOUBLE_WIDER 1 #endif -/* Define to 1 if the system has the type `long long int'. */ +/* Define to 1 if the system has the type 'long long int'. */ #ifndef MAGICKCORE_HAVE_LONG_LONG_INT #define MAGICKCORE_HAVE_LONG_LONG_INT 1 #endif @@ -964,7 +964,7 @@ #define MAGICKCORE_HAVE_UNISTD_H 1 #endif -/* Define to 1 if the system has the type `unsigned long long int'. */ +/* Define to 1 if the system has the type 'unsigned long long int'. */ #ifndef MAGICKCORE_HAVE_UNSIGNED_LONG_LONG_INT #define MAGICKCORE_HAVE_UNSIGNED_LONG_LONG_INT 1 #endif @@ -1122,7 +1122,7 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/lib64/ImageMagick-7.0.0/" +#define MAGICKCORE_LIBRARY_PATH "/usr/lib/ImageMagick-7.0.0/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are diff --git a/MagickCore/version.h b/MagickCore/version.h index 433e38056..84c6ab617 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,19 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "12538:12539M" +#define MagickSVNRevision "12671:12693M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-06-29" +#define MagickppLibVersionText "7.0.0" +#define MagickppLibVersionNumber @MAGICKPP_LIB_VERSION_NUMBER@ +#define MagickppLibAddendum "-0" +#define MagickppLibInterface 2 +#define MagickppLibMinInterface 2 +#define MagickReleaseDate "2013-07-14" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in index a715d8580..33b43308a 100644 --- a/MagickCore/version.h.in +++ b/MagickCore/version.h.in @@ -34,6 +34,11 @@ extern "C" { #define MagickLibAddendum "@PACKAGE_VERSION_ADDENDUM@" #define MagickLibInterface @MAGICK_LIBRARY_CURRENT@ #define MagickLibMinInterface @MAGICK_LIBRARY_CURRENT_MIN@ +#define MagickppLibVersionText "@MAGICKPP_LIB_VERSION_TEXT@" +#define MagickppLibVersionNumber @MAGICKPP_LIB_VERSION_NUMBER@ +#define MagickppLibAddendum "@PACKAGE_VERSION_ADDENDUM@" +#define MagickppLibInterface @MAGICKPP_LIBRARY_CURRENT@ +#define MagickppLibMinInterface @MAGICKPP_LIBRARY_CURRENT_MIN@ #define MagickReleaseDate "@PACKAGE_RELEASE_DATE@" #define MagickChangeDate "@PACKAGE_CHANGE_DATE@" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/Makefile.in b/Makefile.in index ce2409b16..1620943cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2666,6 +2666,13 @@ LZMA_CFLAGS = @LZMA_CFLAGS@ LZMA_LIBS = @LZMA_LIBS@ LaunchDelegate = @LaunchDelegate@ MAGICKCORE_PATH = @MAGICKCORE_PATH@ +MAGICKPP_LIBRARY_AGE = @MAGICKPP_LIBRARY_AGE@ +MAGICKPP_LIBRARY_CURRENT = @MAGICKPP_LIBRARY_CURRENT@ +MAGICKPP_LIBRARY_CURRENT_MIN = @MAGICKPP_LIBRARY_CURRENT_MIN@ +MAGICKPP_LIBRARY_REVISION = @MAGICKPP_LIBRARY_REVISION@ +MAGICKPP_LIBRARY_VERSION_INFO = @MAGICKPP_LIBRARY_VERSION_INFO@ +MAGICKPP_LIB_VERSION = @MAGICKPP_LIB_VERSION@ +MAGICKPP_LIB_VERSION_TEXT = @MAGICKPP_LIB_VERSION_TEXT@ MAGICK_ABI_SUFFIX = @MAGICK_ABI_SUFFIX@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ MAGICK_CODER_MODULE_PATH = @MAGICK_CODER_MODULE_PATH@ @@ -4774,7 +4781,7 @@ MAGICKPP_INCHEADERS_OPT = \ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \ $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \ -version-info \ - $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) + $(MAGICKPP_LIBRARY_CURRENT):$(MAGICKPP_LIBRARY_REVISION):$(MAGICKPP_LIBRARY_AGE) Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) MAGICKPP_CHECK_PGRMS_OPT = \ diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index ee8bef1fe..5e4b89d36 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -266,6 +266,6 @@ sub MY::makeaperl { # tries to insert our library path first. Also, use the same compiler used # to build perlmain.c to link so that a C++ compiler may be used if # necessary. - $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/lib64: ; + $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/lib: ; $inherited; } diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL index 570c90b1e..2eeca24e0 100644 --- a/PerlMagick/quantum/Makefile.PL +++ b/PerlMagick/quantum/Makefile.PL @@ -265,6 +265,6 @@ sub MY::makeaperl { # tries to insert our library path first. Also, use the same compiler used # to build perlmain.c to link so that a C++ compiler may be used if # necessary. - $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/lib64: ; + $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/lib: ; $inherited; } diff --git a/aclocal.m4 b/aclocal.m4 index a17c9a823..4c7c2f479 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,6 +20,120 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# longlong.m4 serial 17 +dnl Copyright (C) 1999-2007, 2009-2013 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +# Define HAVE_LONG_LONG_INT if 'long long int' works. +# This fixes a bug in Autoconf 2.61, and can be faster +# than what's in Autoconf 2.62 through 2.68. + +# Note: If the type 'long long int' exists but is only 32 bits large +# (as on some very old compilers), HAVE_LONG_LONG_INT will not be +# defined. In this case you can treat 'long long int' like 'long int'. + +AC_DEFUN([AC_TYPE_LONG_LONG_INT], +[ + AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) + AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], + [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 + dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. + dnl If cross compiling, assume the bug is not important, since + dnl nobody cross compiles for this platform as far as we know. + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[@%:@include + @%:@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=no], + [:]) + fi + fi]) + 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, and can be faster +# than what's in Autoconf 2.62 through 2.68. + +# 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_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [], + [ac_cv_type_unsigned_long_long_int=no]) + fi]) + 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/config/config.h.in b/config/config.h.in index 3cd092692..006b75b18 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -279,7 +279,7 @@ than `double'. */ #undef HAVE_LONG_DOUBLE_WIDER -/* Define to 1 if the system has the type `long long int'. */ +/* Define to 1 if the system has the type 'long long int'. */ #undef HAVE_LONG_LONG_INT /* Define to 1 if you have the `lstat' function. */ @@ -625,7 +625,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if the system has the type `unsigned long long int'. */ +/* Define to 1 if the system has the type 'unsigned long long int'. */ #undef HAVE_UNSIGNED_LONG_LONG_INT /* Define to 1 if you have the `uselocale' function. */ diff --git a/configure b/configure index a937cefb9..94ef5ed29 100755 --- a/configure +++ b/configure @@ -1000,6 +1000,8 @@ BIN_DIR EXEC_PREFIX_DIR PREFIX_DIR CONFIG_STATUS_DEPENDENCIES +MAGICKPP_LIB_VERSION_TEXT +MAGICKPP_LIB_VERSION MAGICK_LIB_VERSION_NUMBER MAGICK_LIB_VERSION_TEXT MAGICK_LIB_VERSION @@ -1037,6 +1039,11 @@ PACKAGE_LIB_VERSION PACKAGE_CHANGE_DATE PACKAGE_RELEASE PACKAGE_PERL_VERSION +MAGICKPP_LIBRARY_VERSION_INFO +MAGICKPP_LIBRARY_CURRENT_MIN +MAGICKPP_LIBRARY_AGE +MAGICKPP_LIBRARY_REVISION +MAGICKPP_LIBRARY_CURRENT MAGICK_LIBRARY_VERSION_INFO MAGICK_LIBRARY_CURRENT_MIN MAGICK_LIBRARY_AGE @@ -3679,7 +3686,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=12538:12539M +MAGICK_SVN_REVISION=12671:12693M # Substitute library versioning @@ -3688,6 +3695,11 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE +MAGICKPP_LIBRARY_CURRENT_MIN=`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE` + +MAGICKPP_LIBRARY_VERSION_INFO=$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE + + # Ensure that make can run correctly { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 @@ -4270,6 +4282,7 @@ fi AM_BACKSLASH='\' +# versionning of library MAGICK_LIB_VERSION="0x" if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0 @@ -4293,6 +4306,31 @@ MAGICK_LIB_VERSION_TEXT="${PACKAGE_VERSION}" MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" +MAGICKPP_LIB_VERSION="0x" +if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT} +if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE} +if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION} + + +# Definition used to define MagickLibVersionText in version.h +MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}" + + +# Definition used to define MagickLibVersionNumber in version.h +MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" + + + + # Regenerate config.status if ChangeLog or version.sh is updated. CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version.sh' @@ -22582,18 +22620,18 @@ else /* 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 () @@ -22602,9 +22640,9 @@ 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; } @@ -22636,33 +22674,33 @@ if ${ac_cv_type_long_long_int+:} false; then : else 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 : + 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; } @@ -22676,7 +22714,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi + fi fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 @@ -22845,33 +22883,33 @@ if ${ac_cv_type_long_long_int+:} false; then : else 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 : + 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; } @@ -22885,7 +22923,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi + fi fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 @@ -23138,18 +23176,18 @@ else /* 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 () @@ -23158,9 +23196,9 @@ 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; } diff --git a/configure.ac b/configure.ac index b0593a566..11a71769b 100755 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,14 @@ AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN], AC_SUBST([MAGICK_LIBRARY_VERSION_INFO], [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE]) +AC_SUBST(MAGICKPP_LIBRARY_CURRENT)dnl +AC_SUBST(MAGICKPP_LIBRARY_REVISION)dnl +AC_SUBST(MAGICKPP_LIBRARY_AGE)dnl +AC_SUBST([MAGICKPP_LIBRARY_CURRENT_MIN], + [`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`]) +AC_SUBST([MAGICKPP_LIBRARY_VERSION_INFO], + [$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE]) + AC_SUBST(PACKAGE_NAME)dnl AC_SUBST(PACKAGE_VERSION)dnl AC_SUBST(PACKAGE_PERL_VERSION)dnl @@ -152,6 +160,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-ob # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +# versionning of library MAGICK_LIB_VERSION="0x" if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0 @@ -175,6 +184,31 @@ AC_SUBST(MAGICK_LIB_VERSION_TEXT) MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" AC_SUBST(MAGICK_LIB_VERSION_NUMBER) +MAGICKPP_LIB_VERSION="0x" +if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT} +if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE} +if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION} +AC_SUBST(MAGICKPP_LIB_VERSION) + +# Definition used to define MagickLibVersionText in version.h +MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}" +AC_SUBST(MAGICKPP_LIB_VERSION_TEXT) + +# Definition used to define MagickLibVersionNumber in version.h +MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" +AC_SUBST(MAGICK_LIB_VERSION_NUMBER) + + + # Regenerate config.status if ChangeLog or version.sh is updated. AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/version.sh']) diff --git a/version.sh b/version.sh index 29a22a128..cdeb964bb 100644 --- a/version.sh +++ b/version.sh @@ -42,3 +42,8 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}" MAGICK_LIBRARY_CURRENT=1 MAGICK_LIBRARY_REVISION=0 MAGICK_LIBRARY_AGE=0 + +# magick++ +MAGICKPP_LIBRARY_CURRENT=2 +MAGICKPP_LIBRARY_REVISION=0 +MAGICKPP_LIBRARY_AGE=0 -- 2.50.0