From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 24 Sep 2009 15:26:10 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3ba2cb853192f546b9684546d78f7abb592e3c3;p=imagemagick

---

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 619d67102..2833b8f94 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -59,10 +59,10 @@ WriteMakefile
    'DEFINE'	=> ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING' 
 
    # Header search specfication and preprocessor flags
-   'INC'	=> '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
+   'INC'	=> '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"',
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99',
+   'CC' => 'gcc -std=gnu99',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2",
@@ -71,7 +71,7 @@ WriteMakefile
    'CCFLAGS' => "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread",
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99' : $Config{'ld'},
+   'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} -lfreetype",
diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
index 92aac9986..35fa0d64a 100644
--- a/PerlMagick/Makefile.PL.in
+++ b/PerlMagick/Makefile.PL.in
@@ -59,10 +59,10 @@ WriteMakefile
    'DEFINE'	=> '@LFS_CPPFLAGS@ @DEFS@',     # e.g., '-DHAVE_SOMETHING' 
 
    # Header search specfication and preprocessor flags
-   'INC'	=> '-I../ -I@top_srcdir@ @CPPFLAGS@',
+   'INC'	=> '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"',
 
    # C compiler
-   #'CC' => '@CC@',
+   'CC' => '@CC@',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} @CPPFLAGS@",
@@ -71,7 +71,7 @@ WriteMakefile
    'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@",
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
+   'LD' => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} @LDFLAGS@",
diff --git a/config/configure.xml b/config/configure.xml
index 1a56abc68..7540883b5 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x656"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,6,5"/>
-  <configure name="RELEASE_DATE" value="2009-09-22"/>
+  <configure name="RELEASE_DATE" value="2009-09-24"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/magick/version.h b/magick/version.h
index 36c04c97f..f0d7eae46 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
 #define MagickLibSubversion  "-5"
-#define MagickReleaseDate  "2009-09-22"
+#define MagickReleaseDate  "2009-09-24"
 #define MagickChangeDate   "20090922"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html"