Merge pull request #380 from pfaffman/multi-container

[discourse_docker.git] / image / base / install-imagemagick

diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index f28c03d27fd7b046bc1c922e8c0f0b6170e3e386..7530e125efa02d838a8cbb7fb304dc478e7e0dc8 100755 (executable)
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -3,25 +3,27 @@ set -o errexit
 
 # Install build deps
 apt-get -y -q remove imagemagick
-apt-get -y -q install ghostscript gsfonts autoconf libbz2-dev libjpeg-dev libtiff-dev libfreetype6-dev
+apt-get -y -q install ghostscript gsfonts pkg-config autoconf libbz2-dev libjpeg-dev libtiff-dev libfreetype6-dev
 
 PREFIX=/usr/local
 WDIR=/tmp/imagemagick
 mkdir -p $WDIR
 
 # Build and install libpng
-git clone -b v1.6.19 git://git.code.sf.net/p/libpng/code $WDIR/libpng
+git clone -b v1.6.24 git://git.code.sf.net/p/libpng/code $WDIR/libpng
 cd $WDIR/libpng
 ./autogen.sh
 ./configure --prefix=$PREFIX
 make all && make install
 
+
+
 # Build and install ImageMagick
-wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.4-1.tar.gz"
+wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/6.9.8-10.tar.gz"
 IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
 tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
 cd $IMDIR
-LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
+PKG_CONF_LIBDIR=$PREFIX/lib LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
           --prefix=$PREFIX \
           --enable-static \
           --enable-bounds-checking \
@@ -42,6 +44,7 @@ LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
           --with-tiff
 make all && make install
 
+
 cd $HOME
 rm -rf $WDIR
 ldconfig