diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index f98e6c9..fa4a26e 100755
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -40,7 +40,7 @@
echo $exec_prefix
;;
--version)
- echo '6.6.9 Q16 HDRI'
+ echo '6.6.9 Q16 '
;;
--cflags)
echo "-I${includedir} -fopenmp"
@@ -55,7 +55,7 @@
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 "
+ 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 "${usage}" 1>&2
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 83ca8f3..41a41bf 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -198,7 +198,7 @@
'INC' => $INC_magick,
# C compiler
- #'CC' => 'g++',
+ #'CC' => 'gcc -std=gnu99 -std=gnu99',
# 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 @@
'CCFLAGS' => $CCFLAGS_magick,
# Linker
- #'LD' => $Config{'ld'} == $Config{'cc'} ? 'g++' : $Config{'ld'},
+ #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
# Linker flags for building an executable
'LDFLAGS' => $LDFLAGS_magick,
@@ -228,7 +228,7 @@
# 'OPTIMIZE' => '',
# Use same compiler as ImageMagick
- 'PERLMAINCC' => 'g++ -fopenmp',
+ 'PERLMAINCC' => ' -fopenmp',
# Set Perl installation prefix to ImageMagick installation prefix
# 'PREFIX' => '/usr/local',
diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 521a28a..731f0ec 100755
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -41,10 +41,10 @@
if test -x PerlMagick -a -f Makefile.aperl ; then
# Static build test incantation
- ${MAKE} -f Makefile.aperl CC='g++' TEST_VERBOSE=1 test
+ ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
elif test -f Makefile -a -f Magick.o; then
# Shared build test incantation
- ${MAKE} CC='g++' TEST_VERBOSE=1 test
+ ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
else
echo 'PerlMagick has not been built!'
exit 1
diff --git a/config/configure.xml b/config/configure.xml
index 7064fa9..d9c1d37 100644
--- 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="4345" />
<configure name="RELEASE_DATE" value="2011-04-30"/>
- <configure name="CONFIGURE" value="./configure '--disable-shared' '--enable-hdri' 'CC=g++'"/>
+ <configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
@@ -22,21 +22,21 @@
<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="g++"/>
+ <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
<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 "/>
+ <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="CXX" value="g++"/>
<configure name="CXXFLAGS" value="-g -O2 -pthread"/>
- <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="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="TARGET_CPU" value="x86_64"/>
<configure name="TARGET_VENDOR" value="unknown"/>
<configure name="TARGET_OS" value="linux-gnu"/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
- <configure name="FEATURES" value="HDRI OpenMP "/>
+ <configure name="FEATURES" value="OpenMP "/>
<configure name="DELEGATES" value="bzlib fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml zlib"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2011 ImageMagick Studio LLC"/>
<configure name="WEBSITE" value="http://www.imagemagick.org"/>
diff --git a/libtool b/libtool
index 4ecdcfc..7b4dd92 100755
--- a/libtool
+++ b/libtool
@@ -74,7 +74,7 @@
OBJDUMP="objdump"
# Whether or not to build shared libraries.
-build_libtool_libs=no
+build_libtool_libs=yes
# Whether or not to build static libraries.
build_old_libs=yes
@@ -83,7 +83,7 @@
pic_mode=default
# Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
# The host system.
host_alias=
@@ -161,7 +161,7 @@
lock_old_archive_extraction=no
# A C compiler.
-LTCC="g++"
+LTCC="gcc -std=gnu99 -std=gnu99"
# LTCC compiler flags.
LTCFLAGS="-fopenmp -g -O2 -Wall -pthread"
@@ -281,10 +281,10 @@
dlopen_support=yes
# Whether dlopen of programs is supported.
-dlopen_self=no
+dlopen_self=yes
# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
+dlopen_self_static=yes
# Commands to strip libraries.
old_striplib="strip --strip-debug"
@@ -302,13 +302,13 @@
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
# A language specific compiler.
-CC="g++"
+CC="gcc -std=gnu99 -std=gnu99"
# Is the compiler the GNU compiler?
with_gcc=yes
# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
+no_builtin_flag=" -fno-builtin"
# Additional compiler flags for building library objects.
pic_flag=" -fPIC -DPIC"
@@ -323,7 +323,7 @@
compiler_c_o="yes"
# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=yes
+build_libtool_need_lc=no
# 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 dd24130..ef6408c 100755
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -37,7 +37,7 @@
echo $exec_prefix
;;
--version)
- echo '6.6.9 Q16 HDRI'
+ echo '6.6.9 Q16 '
;;
--cflags)
echo "-I${includedir} -fopenmp"
@@ -52,7 +52,7 @@
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 "
+ 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 "${usage}" 1>&2
diff --git a/magick/magick-config.h b/magick/magick-config.h
index c5b9be1..a42a7bf 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -502,7 +502,9 @@
#endif
/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP_FILEIO */
+#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
+#define MAGICKCORE_HAVE_MMAP_FILEIO 1
+#endif
/* Define to 1 if you have the `munmap' function. */
#ifndef MAGICKCORE_HAVE_MUNMAP
@@ -1027,7 +1029,9 @@
#endif
/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
+#ifndef MAGICKCORE_HAVE__BOOL
+#define MAGICKCORE_HAVE__BOOL 1
+#endif
/* Define to 1 if you have the `_exit' function. */
#ifndef MAGICKCORE_HAVE__EXIT
@@ -1055,9 +1059,7 @@
#endif
/* accurately represent the wide range of intensity levels in real scenes */
-#ifndef MAGICKCORE_HDRI_SUPPORT
-#define MAGICKCORE_HDRI_SUPPORT 1
-#endif
+/* #undef HDRI_SUPPORT */
/* Define if you have umem memory allocation library */
/* #undef HasUMEM */
@@ -1100,7 +1102,9 @@
/* #undef LQR_DELEGATE */
/* Define if using libltdl to support dynamically loadable modules */
-/* #undef LTDL_DELEGATE */
+#ifndef MAGICKCORE_LTDL_DELEGATE
+#define MAGICKCORE_LTDL_DELEGATE 1
+#endif
/* 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 49c6e76..6e6ca30 100755
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -37,7 +37,7 @@
echo $exec_prefix
;;
--version)
- echo '6.6.9 Q16 HDRI'
+ echo '6.6.9 Q16 '
;;
--cflags)
echo "-I${includedir} -fopenmp"
@@ -52,7 +52,7 @@
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 "
+ 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 "${usage}" 1>&2