# HG changeset patch
# User John Swensen <jpswensen@gmail.com>
# Date 1285737188 14400
# Node ID 9ac165a677471a61278d7e72768ddb1091e2d8f0
# Parent  4cbb08163a1fb9ca7f4c42bf199cc3e50721d8bb
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick.  GraphicsMagick is still the default option.

diff -r 4cbb08163a1f -r 9ac165a67747 ChangeLog
--- a/ChangeLog	Tue Sep 28 19:22:01 2010 -0700
+++ b/ChangeLog	Wed Sep 29 01:13:08 2010 -0400
@@ -1,3 +1,8 @@
+2010-09-29  John P. Swensen  <jpswensen@gmail.com>
+
+	* configure.ac: Allow selection of GraphicsMagick or ImageMagick
+	at configure time using "--with-magick=" option.
+
 2010-09-24  Jaroslav Hajek  <highegg@gmail.com>
 
 	* m4/ax_blas.m4: Update.
diff -r 4cbb08163a1f -r 9ac165a67747 configure.ac
--- a/configure.ac	Tue Sep 28 19:22:01 2010 -0700
+++ b/configure.ac	Wed Sep 29 01:13:08 2010 -0400
@@ -765,23 +765,29 @@
 LIBS="$save_LIBS"
 CPPFLAGS="$save_CPPFLAGS"
 
-### GraphicsMagick++
+### Graphics/ImageMagick++
 
-warn_magick="GraphicsMagick++ library not found.  The imread function for reading image files will not be fully functional."
+  AC_ARG_WITH(magick,
+          [  --with-magick=LIB   Library to use for image IO (options: GraphicsMagick(default) or ImageMagick)],
+          magick="$withval",
+          magick="GraphicsMagick")
+
+
+warn_magick="$magick++ library not found.  The imread function for reading image files will not be fully functional."
 
 MAGICK_CPPFLAGS=
 MAGICK_LDFLAGS=
 MAGICK_LIBS=
 
-PKG_CHECK_EXISTS([GraphicsMagick++], [
-  ## Make sure we only get -I, -L and -l flags. Some GraphicsMagick++
+PKG_CHECK_EXISTS([$magick++], [
+  ## Make sure we only get -I, -L and -l flags. Some Graphics/ImageMagick++
   ## packages adds extra flags that are useful when building
-  ## GraphicsMagick++ extentions. These extra flags break the Octave build.
-  MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L GraphicsMagick++`
-  MAGICK_LIBS=`$PKG_CONFIG --libs-only-l GraphicsMagick++`
-  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I GraphicsMagick++`
+  ## Graphics/ImageMagick++ extentions. These extra flags break the Octave build.
+  MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
+  MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
+  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
 
-  warn_magick="GraphicsMagick++ library fails tests.  The imread function for reading image files will not be fully functional."
+  warn_magick="$magick++ library fails tests.  The imread function for reading image files will not be fully functional."
 
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
@@ -803,7 +809,7 @@
 ])
 
 if test -z "$warn_magick"; then
-  AC_DEFINE(HAVE_MAGICK, 1, [Define if GraphicsMagick++ is available.])
+  AC_DEFINE(HAVE_MAGICK, 1, [Define if Graphics/ImageMagick++ is available.])
 else
   MAGICK_CPPFLAGS=
   MAGICK_LDFLAGS=
@@ -2133,9 +2139,9 @@
   GLPK libraries:              $GLPK_LIBS
   graphics CFLAGS:             $GRAPHICS_CFLAGS
   graphics LIBS:               $GRAPHICS_LIBS
-  GraphicsMagick++ CPPFLAGS:   $MAGICK_CPPFLAGS
-  GraphicsMagick++ LDFLAGS:    $MAGICK_LDFLAGS
-  GraphicsMagick++ libraries:  $MAGICK_LIBS
+  Magick++ CPPFLAGS:           $MAGICK_CPPFLAGS
+  Magick++ LDFLAGS:            $MAGICK_LDFLAGS
+  Magick++ libraries:          $MAGICK_LIBS
   HDF5 CPPFLAGS:               $HDF5_CPPFLAGS
   HDF5 LDFLAGS:                $HDF5_LDFLAGS
   HDF5 libraries:              $HDF5_LIBS