Changeset 11467

Timestamp:

06/23/08 09:55:26 (2 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• config/configure.xml (modified) (1 diff)
• config/ltmain.sh (modified) (3 diffs)
• configure (modified) (12 diffs)
• libtool (modified) (4 diffs)
• m4/libtool.m4 (modified) (2 diffs)
• m4/ltversion.m4 (modified) (1 diff)
• magick/version.h (modified) (1 diff)

ImageMagick/trunk/config/configure.xml

@@ -10 +10 @@
   <configure name="LIB_VERSION" value="0x642"/>
   <configure name="LIB_VERSION_NUMBER" value="6,4,2,0"/>
-  <configure name="RELEASE_DATE" value="06/22/08"/>
+  <configure name="RELEASE_DATE" value="06/23/08"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

ImageMagick/trunk/config/ltmain.sh

@@ -1 +1 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool 1.2992 2008-06-17) 2.2.5a
+# ltmain.sh (GNU libtool 1.2993 2008-06-19) 2.2.5a
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
@@ -66 +66 @@
 #       compiler flags:         $LTCFLAGS
 #       linker:         $LD (gnu? $with_gnu_ld)
-#       $progname:              (GNU libtool 1.2992 2008-06-17) 2.2.5a
+#       $progname:              (GNU libtool 1.2993 2008-06-19) 2.2.5a
 #       automake:               $automake_version
 #       autoconf:               $autoconf_version
@@ -75 +75 @@
 PACKAGE=libtool
 VERSION=2.2.5a
-TIMESTAMP=" 1.2992 2008-06-17"
-package_revision=1.2992
+TIMESTAMP=" 1.2993 2008-06-19"
+package_revision=1.2993
 
 # Be Bourne compatible

ImageMagick/trunk/configure

@@ -7790 +7790 @@
 
 macro_version='2.2.5a'
-macro_revision='1.2992'
+macro_revision='1.2993'
 
 
@@ -11780 +11780 @@
     linux* | k*bsd*-gnu)
       case $cc_basename in
-      icc* | ecc*)
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
         lt_prog_compiler_wl='-Wl,'
         lt_prog_compiler_pic='-KPIC'
         lt_prog_compiler_static='-static'
         ;;
-      ifort*)
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
         lt_prog_compiler_wl='-Wl,'
         lt_prog_compiler_pic='-fPIC'
@@ -11939 +11942 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11941: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11944: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11945: \$? = $ac_status" >&5
+   echo "$as_me:11948: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12044 +12047 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12046: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12049: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12050: \$? = $ac_status" >&5
+   echo "$as_me:12053: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -12099 +12102 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12101: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12104: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12105: \$? = $ac_status" >&5
+   echo "$as_me:12108: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14895 +14898 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14897 "configure"
+#line 14900 "configure"
 #include "confdefs.h"
 
@@ -14995 +14998 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14997 "configure"
+#line 15000 "configure"
 #include "confdefs.h"
 
@@ -16836 +16839 @@
             lt_prog_compiler_pic_CXX='-fPIC'
             ;;
-          icpc* | ecpc* )
-            # Intel C++
+          ecpc* )
+            # old Intel C++ for x86_64 which still supported -KPIC.
             lt_prog_compiler_wl_CXX='-Wl,'
             lt_prog_compiler_pic_CXX='-KPIC'
+            lt_prog_compiler_static_CXX='-static'
+            ;;
+          icpc* )
+            # Intel C++, used to be incompatible with GCC.
+            # ICC 10 doesn't accept -KPIC any more.
+            lt_prog_compiler_wl_CXX='-Wl,'
+            lt_prog_compiler_pic_CXX='-fPIC'
             lt_prog_compiler_static_CXX='-static'
             ;;
@@ -17010 +17020 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17012: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17022: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17016: \$? = $ac_status" >&5
+   echo "$as_me:17026: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17109 +17119 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17111: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17121: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17115: \$? = $ac_status" >&5
+   echo "$as_me:17125: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -17161 +17171 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17167: \$? = $ac_status" >&5
+   echo "$as_me:17177: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -19081 +19091 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19083 "configure"
+#line 19093 "configure"
 #include "confdefs.h"
 

ImageMagick/trunk/libtool

@@ -56 +56 @@
 # Which release of libtool.m4 was used?
 macro_version=2.2.5a
-macro_revision=1.2992
+macro_revision=1.2993
 
 # Assembler program.
@@ -412 +412 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool 1.2992 2008-06-17) 2.2.5a
+# ltmain.sh (GNU libtool 1.2993 2008-06-19) 2.2.5a
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
@@ -477 +477 @@
 #       compiler flags:         $LTCFLAGS
 #       linker:         $LD (gnu? $with_gnu_ld)
-#       $progname:              (GNU libtool 1.2992 2008-06-17) 2.2.5a
+#       $progname:              (GNU libtool 1.2993 2008-06-19) 2.2.5a
 #       automake:               $automake_version
 #       autoconf:               $autoconf_version
@@ -486 +486 @@
 PACKAGE=libtool
 VERSION=2.2.5a
-TIMESTAMP=" 1.2992 2008-06-17"
-package_revision=1.2992
+TIMESTAMP=" 1.2993 2008-06-19"
+package_revision=1.2993
 
 # Be Bourne compatible

ImageMagick/trunk/m4/libtool.m4

@@ -3698 +3698 @@
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
             ;;
-          icpc* | ecpc* )
-            # Intel C++
+          ecpc* )
+            # old Intel C++ for x86_64 which still supported -KPIC.
             _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+            ;;
+          icpc* )
+            # Intel C++, used to be incompatible with GCC.
+            # ICC 10 doesn't accept -KPIC any more.
+            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
             _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
             ;;
@@ -3969 +3976 @@
     linux* | k*bsd*-gnu)
       case $cc_basename in
-      icc* | ecc*)
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
-      ifort*)
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

ImageMagick/trunk/m4/ltversion.m4

@@ -10 +10 @@
 # Generated from ltversion.in.
 
-# serial 2992 ltversion.m4
+# serial 2993 ltversion.m4
 # This file is part of GNU Libtool
 
 m4_define([LT_PACKAGE_VERSION], [2.2.5a])
-m4_define([LT_PACKAGE_REVISION], [1.2992])
+m4_define([LT_PACKAGE_REVISION], [1.2993])
 
 AC_DEFUN([LTVERSION_VERSION],
 [macro_version='2.2.5a'
-macro_revision='1.2992'
+macro_revision='1.2993'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)

ImageMagick/trunk/magick/version.h

@@ -47 +47 @@
 #define MagickQuantumRange  "?"
 #endif
-#define MagickReleaseDate  "06/22/08"
+#define MagickReleaseDate  "06/23/08"
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
 #define MagickHDRISupport ""