(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 3e54414c1301f3e9be6a7ee3990e369b2aaa6655..282e8117e8f077850ff7bc3f2c09125d852b1e5e 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.7
-%define Patchlevel  5
+%define Patchlevel  4
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 8b90a3099bb65f2c9e54e9e6a6157ec0ea501389..01983b70577feee2d9714ca3bf4d5f7623c9bc78 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -210,7 +210,7 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => ' -fopenmp',
+   'PERLMAINCC'        => 'gcc -std=gnu99 -fopenmp',
 
    # Set Perl installation prefix to ImageMagick installation prefix
 #   'PREFIX'   => '/usr/local',

diff --git a/config/configure.xml b/config/configure.xml
index 616dfc87beee2b2e3dd5c04105efeaccbf637f4d..179a14b909d5c5fbed0e53abff7a4675ac4dfdaf 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,9 +8,9 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,7,5"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,7,4"/>
   <configure name="RELEASE_DATE" value="2009-11-02"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="CONFIGURE" value="./configure  'CC=gcc -std=gnu99'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.5.7"/>
@@ -23,7 +23,7 @@
   <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=gcc -std=gnu99' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2009 ImageMagick Studio LLC"/>

diff --git a/libtool b/libtool
index 703a9c9d825acb336710301b318f9ba41aaef184..456d3f546353735486d262b7c6c07db32cf3d888 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.5.7-5
+# Generated automatically by config.status (ImageMagick) 6.5.7-4
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/version.h b/magick/version.h
index dd2f851d0b5a1b6261c3df13297db10faaa7d71c..54145381ffa7171ff967bade1413c8df32ec64ab 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x657
 #define MagickLibVersionText  "6.5.7"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-5"
+#define MagickLibSubversion  "-4"
 #define MagickReleaseDate  "2009-11-02"
 #define MagickChangeDate   "20091101"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/utilities/import.c b/utilities/import.c
index e876a911143ca588240bdb586e6caeeb94035e31..37374f8d3317e0abbf661f7424df246f3ef06279 100644 (file)
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -94,7 +94,7 @@ int main(int argc,char **argv)
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,ImportImageCommand,argc,argv,
-    (char *) NULL,exception);
+    (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();

diff --git a/version.sh b/version.sh
index 6b7b79298c3b8b012c1f63675595e2c6137d876e..e6f83f66898e9e19bf6d7cb2f097f471470e53f0 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.5.7'
 PACKAGE_LIB_VERSION="0x657"
-PACKAGE_RELEASE="5"
+PACKAGE_RELEASE="4"
 PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"