Mercurial > octave

changeset 22041:26c0e65e6b77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: clean up warning messages when building without GraphicsMagick * configure.ac: Add a warning message when pkg-config fails to find GraphicsMagick. Reword all GraphicsMagick warning messages to mention all affected functions.
author Mike Miller <mtmiller@octave.org>
date Tue, 05 Jul 2016 12:15:04 -0700
parents 79e7a6fc524d
children 21c12b837089
files configure.ac
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Jul 05 13:00:00 2016 -0500
+++ b/configure.ac	Tue Jul 05 12:15:04 2016 -0700
@@ -1151,7 +1151,7 @@
     [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])],
   [if test x"$withval" = xno; then
      check_magick=no
-     warn_magick_disabled="--without-magick specified.  The imread function for reading images will not be fully functional."
+     warn_magick_disabled="--without-magick specified.  The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."
      OCTAVE_CONFIGURE_WARNING([warn_magick_disabled])
    else
      magick="$withval"
@@ -1172,7 +1172,7 @@
     MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
     MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
 
-    warn_magick="$magick++ library fails tests.  The imread function for reading image files will not be fully functional."
+    warn_magick="$magick++ library fails tests.  The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."
 
     save_CPPFLAGS="$CPPFLAGS"
     save_LIBS="$LIBS"
@@ -1201,8 +1201,10 @@
 
     AC_CHECK_FUNCS([setlocale], [],
       [use_magick=no
-       warn_magick="$magick++ requires setlocale function.  The imread function for reading image files will not be fully functional."])
-  ])
+       warn_magick="$magick++ requires setlocale function.  The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."])
+  ],
+  [use_magick=no
+   warn_magick="$magick++ library not found.  The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."])
 fi
 
 if test $use_magick = yes; then