Changeset 23775 for gs2-extensions

Timestamp:

2011-03-15T11:58:23+13:00 (13 years ago)

Author:

sjm84

Message:

A few minor changes to the imagemagick extension

Location:

gs2-extensions/imagemagick/trunk/src/packages

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• CASCADE-MAKE/IMAGEMAGICK.sh (modified) (1 diff)

gs2-extensions/imagemagick/trunk/src/packages/CASCADE-MAKE.sh

@@ -3 +3 @@
 source ../cascade-make/lib/cascade-lib.bash GEXTIMAGEMAGICK .. $*
 
-for d in TIFF LIBPNG JPEG JPEG2000 IMAGEMAGICK ; do
+for d in TIFF JPEG LIBPNG JPEG2000 IMAGEMAGICK ; do
     echo "    Running CASCADE-MAKE/$d.sh"
 

gs2-extensions/imagemagick/trunk/src/packages/CASCADE-MAKE/IMAGEMAGICK.sh

@@ -10 +10 @@
 prefix=$GEXTIMAGEMAGICK_INSTALLED
 
-
 export CFLAGS="$CFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
 export CPPFLAGS="$CPPFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
 export CXXFLAGS="$CXXFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
 export LDFLAGS="$LDFLAGS -L$GEXTIMAGEMAGICK_INSTALLED/lib"
+export LD_LIBRARY_PATH="$GEXTIMAGEMAGICK_INSTALLED/lib"
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix --with-jpeg=$prefix
+opt_run_configure $force_config $auto_config $package $version $prefix
 
 opt_run_make $compile $package $version