--- ./ltdl/acinclude.m4 Sun Oct 28 21:10:26 2001 +++ ../ImageMagick-5.4.1/./ltdl/acinclude.m4 Thu Dec 13 12:27:13 2001 @@ -218,7 +218,7 @@ [AC_REQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -3391,7 +3391,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) --- ./ltdl/aclocal.m4 Sun Oct 28 21:10:26 2001 +++ ../ImageMagick-5.4.1/./ltdl/aclocal.m4 Thu Dec 13 12:27:31 2001 @@ -209,7 +209,7 @@ [AC_REQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -3370,7 +3370,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) --- ./ltdl/configure Thu Nov 15 10:29:33 2001 +++ ../ImageMagick-5.4.1/./ltdl/configure Thu Dec 13 12:28:41 2001 @@ -3013,7 +3013,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -4932,7 +4932,7 @@ lt_simple_link_test_code='main(){return(0);}' # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -7436,7 +7436,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler @@ -8002,7 +8002,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -10487,7 +10487,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_CXX @@ -10767,7 +10767,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -13142,7 +13142,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_GCJ @@ -13422,7 +13422,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -13543,7 +13543,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_RC --- ./PerlMagick/Makefile.PL Thu Dec 6 22:08:23 2001 +++ ../ImageMagick-5.4.1/./PerlMagick/Makefile.PL Fri Dec 14 10:14:45 2001 @@ -32,7 +32,7 @@ # Compute test specification my $delegate_tests='t/*.t'; my $delegate; -foreach $delegate (qw/ bzlib jp2 jpeg mpeg png ps tiff ttf x xfig zlib/) { +foreach $delegate (qw/ bzlib cgm hpgl jpeg lcms png ps tiff ttf wmf x xfig zlib/) { if( -d "t/$delegate" ) { $delegate_tests .= " t/$delegate/*.t"; } @@ -46,19 +46,19 @@ 'ABSTRACT' => 'ImageMagick PERL Extension', # Set compiler flags other than INC and OPTIMIZE - # 'CCFLAGS' => '-g -O2 -Wall', + # 'CCFLAGS' => '-g', # Preprocessor defines 'DEFINE' => '-DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING' # Header search specfication and preprocessor flags - 'INC' => '-I../ -I.. -I/usr/include/freetype2 -D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11', + 'INC' => '-I../ -I.. -I/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/include/libxml2 -I/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/include/freetype2 -D_REENTRANT', # Install PerlMagick binary into ImageMagick bin directory 'INSTALLBIN' => '${exec_prefix}/bin', # Library specification - 'LIBS' => ['-L/usr/lib -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -L/home/cristy/ImageMagick/magick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm'], + 'LIBS' => ['-L/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/lib32 -L/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/lib32 -L/usr/freeware/lib32 -lMagick -llcms -ltiff -lfreetype -ljpeg -lpng -lwmf -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm'], # Perl binary name (if a Perl binary is built) 'MAP_TARGET' => 'PerlMagick', @@ -70,10 +70,10 @@ # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - # 'PERLMAINCC' => 'gcc', + # 'PERLMAINCC' => 'sgifwcompile -e -q -nostdinc -I. -I/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/include -I/usr/people/drk/toolroots/freeware/working/proot/usr/include -O3 -OPT:Olimit=0:space=ON -DEBUG:optimize_space=on -TENV:X=1 -CG:unique_exit=on -OPT:IEEE_arithmetic=1:roundoff=0:wrap_around_unsafe_opt=off -n32 -mips3 -nostdlib -L/usr/people/drk/toolroots/freeware/working/proot/usr/freeware/lib32 -L/usr/people/drk/toolroots/freeware/working/proot/usr/lib32 -woff 1009,1014,1107,1110,1116,1164,1185,1188,1204,1230,1233 -Wl,-woff,85,-woff,84 -rpath /usr/freeware/lib32 -no_unresolved -- /usr/people/drk/toolroots/freeware/working/ptoolroot/usr/bin/cc', # Set Perl installation prefix to ImageMagick installation prefix -# 'PREFIX' => '/usr/local', +# 'PREFIX' => '/usr/freeware', # File to extract PerlMagick version from 'VERSION_FROM' => 'Magick.pm', --- ./utilities/montage.1 Tue Dec 4 13:54:24 2001 +++ ../ImageMagick-5.4.1/./utilities/montage.1 Thu Dec 13 12:32:34 2001 @@ -264,7 +264,7 @@ for comparing two very similar images. .TP .B Multipy -The result of \fIcomposite image\fP \* \fIimage\fP. This is useful for +The result of \fIcomposite image\fP * \fIimage\fP. This is useful for the creation of drop-shadows. .TP .B Bumpmap --- ./utilities/composite.1 Sun Nov 25 20:00:21 2001 +++ ../ImageMagick-5.4.1/./utilities/composite.1 Thu Dec 13 12:32:42 2001 @@ -204,7 +204,7 @@ comparing two very similar images. .TP .B Multipy -The result of \fIcomposite image\fP \* \fIimage\fP. This is useful for +The result of \fIcomposite image\fP * \fIimage\fP. This is useful for the creation of drop-shadows. .TP .B Bumpmap --- ./utilities/display.1 Tue Dec 4 13:54:24 2001 +++ ../ImageMagick-5.4.1/./utilities/display.1 Thu Dec 13 12:33:03 2001 @@ -1044,7 +1044,7 @@ .B "/" Press to rotate the image 90 degrees clockwise. .TP -.B \(bs +.B bs Press to rotate the image 90 degrees counter-clockwise. .TP .B "*" @@ -1539,7 +1539,7 @@ for comparing two very similar images. .TP .B Multipy -The result of \fIcomposite image\fP \* \fIimage\fP. This is useful for +The result of \fIcomposite image\fP * \fIimage\fP. This is useful for the creation of drop-shadows. .TP .B Bumpmap --- ./aclocal.m4 Thu Dec 6 22:08:38 2001 +++ ../ImageMagick-5.4.1/./aclocal.m4 Thu Dec 13 12:33:28 2001 @@ -1211,7 +1211,7 @@ [AC_REQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -4368,7 +4368,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) --- ./configure Thu Dec 6 22:08:49 2001 +++ ../ImageMagick-5.4.1/./configure Thu Dec 13 17:51:48 2001 @@ -3168,7 +3168,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -4569,7 +4569,7 @@ lt_simple_link_test_code='main(){return(0);}' # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -7073,7 +7073,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler @@ -7639,7 +7639,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -10124,7 +10124,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_CXX @@ -10404,7 +10404,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -12779,7 +12779,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_GCJ @@ -13059,7 +13059,7 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +LTCC="${LTCC-$CC}" # Allow CC to be a program name with arguments. set dummy $CC @@ -13180,7 +13180,7 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. -LTCC=$LTCC +LTCC="$LTCC" # A language-specific compiler. CC=$lt_compiler_RC @@ -14077,8 +14077,8 @@ eval "eval INFO_DIR=$infodir" eval "eval MAN_DIR=$mandir" -LDFLAGS="$LDFLAGS -L$LIB_DIR" -CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR" +LDFLAGS="$LDFLAGS" +CPPFLAGS="$CPPFLAGS" # Extend includedir to include magick subdirectory offset includedir="$includedir/magick" @@ -17933,7 +17933,7 @@ if test -n "$freetype_config" then freetype_prefix=`freetype-config --prefix` - LDFLAGS="-L${freetype_prefix}/lib $LDFLAGS" 2> /dev/null + LDFLAGS="-L${freetype_prefix}/lib${libsuff} $LDFLAGS" 2> /dev/null CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS" 2> /dev/null fi fi @@ -18695,7 +18695,7 @@ then CPPFLAGS="-I${xml2_prefix}/include/libxml2 $CPPFLAGS" 2> /dev/null fi - LDFLAGS="-L${xml2_prefix}/lib $LDFLAGS" 2> /dev/null + LDFLAGS="-L${xml2_prefix}/lib${libsuff} $LDFLAGS" 2> /dev/null fi failed=0; passed=0; @@ -18999,7 +18999,7 @@ if test $ac_cv_lib_wmflite_wmf_play = yes; then LIBS="-lwmflite $LIBS";LIB_WMF="-lwmflite $LIB_WMF" else - $extra_libs + : $extra_libs fi echo "$as_me:19005: checking for wmf_api_create in -lwmf" >&5