# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1354116065 18000
# Node ID fddaea7e8096c87ea7a6702c110a94df0f315b75
# Parent  1c18d3bb1829c590438e357e8b25140472c7cb50
Include graphicsmagick as a dependency of Octave

diff -r 1c18d3bb1829 -r fddaea7e8096 src/graphicsmagick.mk
--- a/src/graphicsmagick.mk	Tue Nov 27 18:12:49 2012 -0500
+++ b/src/graphicsmagick.mk	Wed Nov 28 10:21:05 2012 -0500
@@ -48,8 +48,8 @@
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS=
 
-    '$(TARGET)-g++' \
-        -W -Wall -Werror -pedantic -std=gnu++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-graphicsmagick.exe' \
-        `'$(TARGET)-pkg-config' GraphicsMagick++ --cflags --libs`
+##    '$(TARGET)-g++' \
+##        -W -Wall -Werror -pedantic -std=gnu++0x \
+##        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-graphicsmagick.exe' \
+##        `'$(TARGET)-pkg-config' GraphicsMagick++ --cflags --libs`
 endef
diff -r 1c18d3bb1829 -r fddaea7e8096 src/octave.mk
--- a/src/octave.mk	Tue Nov 27 18:12:49 2012 -0500
+++ b/src/octave.mk	Wed Nov 28 10:21:05 2012 -0500
@@ -6,7 +6,7 @@
 $(PKG)_CHECKSUM := 1ea936554aaabaabb747a4fcf98ecfbbfb265656
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
-$(PKG)_DEPS     := blas curl gcc lapack pcre readline suitesparse zlib
+$(PKG)_DEPS     := blas curl gcc graphicsmagick lapack pcre readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;