# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1222794666 14400
# Node ID 75014ec4ac84d4d4637b5423fb6e661726553b33
# Parent  0d37c99fc06faa560de017f367ff4ffa92b97a2f
__magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-30  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/__magick_read__.cc: Only define
+	magick_to_octave_value if HAVE_MAGICK is defined.
+
 2008-09-29  John W. Eaton  <jwe@octave.org>
 
 	* symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method):
diff --git a/src/DLD-FUNCTIONS/__magick_read__.cc b/src/DLD-FUNCTIONS/__magick_read__.cc
--- a/src/DLD-FUNCTIONS/__magick_read__.cc
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc
@@ -799,6 +799,8 @@
 return retval;
 }
 
+#ifdef HAVE_MAGICK
+
 template<class T>
 static octave_value
 magick_to_octave_value (const T magick)
@@ -873,6 +875,8 @@
     { \
     }
 
+#endif
+
 DEFUN_DLD (__magick_finfo__, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\