From: cristy Date: Fri, 23 Apr 2010 14:44:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9598 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40e685d43e9a487595b298ff21bdf05bb529f713;p=imagemagick --- diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 126b6cae8..ee67aabdf 100755 --- 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 -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index e1462aafa..f02873dc6 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -180,7 +180,7 @@ WriteMakefile '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'} -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2", @@ -189,7 +189,7 @@ WriteMakefile '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, @@ -210,7 +210,7 @@ WriteMakefile # '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 c0259043d..dd59071fb 100755 --- 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='g++' test + ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' test elif test -f Makefile -a -f Magick.o; then # Shared build test incantation - ${MAKE} CC='g++' test + ${MAKE} CC='gcc -std=gnu99 -std=gnu99' test else echo 'PerlMagick has not been built!' exit 1 diff --git a/config/configure.xml b/config/configure.xml index 58ff38917..095553fc7 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,20 +10,20 @@ - + - + - + - + diff --git a/libtool b/libtool index 0e7ca73bd..640ed2c4b 100755 --- a/libtool +++ b/libtool @@ -67,7 +67,7 @@ DLLTOOL=dlltool 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 @@ -76,7 +76,7 @@ build_old_libs=yes pic_mode=default # Whether or not to optimize for fast installation. -fast_install=needless +fast_install=yes # The host system. host_alias= @@ -135,7 +135,7 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" old_postuninstall_cmds="" # A C compiler. -LTCC="g++" +LTCC="gcc -std=gnu99 -std=gnu99" # LTCC compiler flags. LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread" @@ -249,10 +249,10 @@ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/alliance/ 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" @@ -266,13 +266,13 @@ LD="/usr/bin/ld -m elf_x86_64" 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" # How to pass a linker flag through the compiler. wl="-Wl," @@ -287,7 +287,7 @@ link_static_flag="" 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 9f9e87490..617b8958d 100755 --- 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 -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/magick/magick-config.h b/magick/magick-config.h index 39804ba40..3771119b4 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -472,7 +472,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 @@ -964,7 +966,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 @@ -1030,7 +1034,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 */ @@ -1313,7 +1319,9 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ +#ifndef MAGICKCORE__FILE_OFFSET_BITS +#define MAGICKCORE__FILE_OFFSET_BITS 64 +#endif /* enable run-time bounds-checking */ /* #undef _FORTIFY_SOURCE */ diff --git a/wand/Wand-config b/wand/Wand-config index 15baea635..61d7a3483 100755 --- 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 -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2