(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index fa4a26eccf5fab1f88b270d1c2387f087652e53a..63faaca27f988065f66487c0eb466522855ff9a8 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 41a41bf8e22d84ee9cbce0858893a7ce7ab2eaa1..83ca8f3fc1216a616ab64e607b19e45f47c94ba9 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -198,7 +198,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99 -std=gnu99',
+   #'CC' => 'g++',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
@@ -207,7 +207,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'g++' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,
@@ -228,7 +228,7 @@ WriteMakefile
    # 'OPTIMIZE'        => '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'        => ' -fopenmp',
+   'PERLMAINCC'        => 'g++ -fopenmp',
 
    # Set Perl installation prefix to ImageMagick installation prefix
 #   'PREFIX'   => '/usr/local',

diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 731f0ecc0265559f9e180218870067b2329cafd8..521a28a2487a036c0a09ae7c0e31f13b27d36627 100755 (executable)
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -41,10 +41,10 @@ fi
 
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='g++' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} CC='g++' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'
   exit 1

diff --git a/coders/map.c b/coders/map.c
index 7224cff37a0b0b591c49a6018ac2d3685460727b..0a5593fb96eb07d81ff3346c13c34fd3f4f915ac 100644 (file)
--- a/coders/map.c
+++ b/coders/map.c
@@ -428,8 +428,7 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if (image->colors > 256)
-        *q++=(unsigned char) ((size_t) (GetIndexPixelComponent(indexes+x) >>
-          8));
+        *q++=(unsigned char) ((size_t) GetIndexPixelComponent(indexes+x) >> 8);
       *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
     }
     (void) WriteBlob(image,(size_t) (q-pixels),pixels);

diff --git a/config/configure.xml b/config/configure.xml
index fcd05c3129e167e195a751ddd5fac3ac60b53c8e..3a97fc0d9e19f6028e9a0665d5013017d745ee67 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -12,7 +12,7 @@
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,7"/>
   <configure name="SVN_REVISION" value="4318" />
   <configure name="RELEASE_DATE" value="2011-04-25"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="CONFIGURE" value="./configure  '--disable-shared' 'CC=g++'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
@@ -22,16 +22,16 @@
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.6.9"/>
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-6.6.9/modules-Q16/coders"/>
   <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-6.6.9/modules-Q16/filters"/>
-  <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
+  <configure name="CC" value="g++"/>
   <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=g++' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="TARGET_CPU" value="x86_64"/>
   <configure name="TARGET_VENDOR" value="unknown"/>
   <configure name="TARGET_OS" value="linux-gnu"/>

diff --git a/libtool b/libtool
index 7b4dd920df12b80b52b0f72ad2a5da9e5ee8c79d..4ecdcfc58db07f40c03ba9539c7adf907ff25cb9 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -74,7 +74,7 @@ DLLTOOL="false"
 OBJDUMP="objdump"
 
 # Whether or not to build shared libraries.
-build_libtool_libs=yes
+build_libtool_libs=no
 
 # Whether or not to build static libraries.
 build_old_libs=yes
@@ -83,7 +83,7 @@ build_old_libs=yes
 pic_mode=default
 
 # Whether or not to optimize for fast installation.
-fast_install=yes
+fast_install=needless
 
 # The host system.
 host_alias=
@@ -161,7 +161,7 @@ old_postuninstall_cmds=""
 lock_old_archive_extraction=no
 
 # A C compiler.
-LTCC="gcc -std=gnu99 -std=gnu99"
+LTCC="g++"
 
 # LTCC compiler flags.
 LTCFLAGS="-fopenmp -g -O2 -Wall -pthread"
@@ -281,10 +281,10 @@ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /us
 dlopen_support=yes
 
 # Whether dlopen of programs is supported.
-dlopen_self=yes
+dlopen_self=no
 
 # Whether dlopen of statically linked programs is supported.
-dlopen_self_static=yes
+dlopen_self_static=unknown
 
 # Commands to strip libraries.
 old_striplib="strip --strip-debug"
@@ -302,13 +302,13 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
 
 # A language specific compiler.
-CC="gcc -std=gnu99 -std=gnu99"
+CC="g++"
 
 # Is the compiler the GNU compiler?
 with_gcc=yes
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 
 # Additional compiler flags for building library objects.
 pic_flag=" -fPIC -DPIC"
@@ -323,7 +323,7 @@ link_static_flag=""
 compiler_c_o="yes"
 
 # Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
+build_libtool_need_lc=yes
 
 # Whether or not to disallow shared libs when runtime libs are static.
 allow_libtool_libs_with_static_runtimes=no

diff --git a/magick/Magick-config b/magick/Magick-config
index ef6408ca0c04e15d674600f276e18b480096ee4f..ef87e9f77599283270507a2ce2a031a2a3d192dd 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/magick-config.h b/magick/magick-config.h
index a42a7bf66df7feaf81c8ae2e3845e07745f87708..2e55f41be711aeb1fad11b3e5c2830e017c842f6 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -502,9 +502,7 @@
 #endif
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
-#define MAGICKCORE_HAVE_MMAP_FILEIO 1
-#endif
+/* #undef HAVE_MMAP_FILEIO */
 
 /* Define to 1 if you have the `munmap' function. */
 #ifndef MAGICKCORE_HAVE_MUNMAP
@@ -1029,9 +1027,7 @@
 #endif
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL
-#define MAGICKCORE_HAVE__BOOL 1
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT
@@ -1102,9 +1098,7 @@
 /* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE
-#define MAGICKCORE_LTDL_DELEGATE 1
-#endif
+/* #undef LTDL_DELEGATE */
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 /* #undef LTDL_DLOPEN_DEPLIBS */

diff --git a/wand/Wand-config b/wand/Wand-config
index 6e6ca30c56fbb2a3eeac46879658f16460cf387d..2296fec0f6cf0e52beb00b5cb83a0365c3911ffd 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "
       ;;
     *)
       echo "${usage}" 1>&2