Mercurial > octave-nkf
changeset 10011:411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
| author | Rik <rdrider0-list@yahoo.com> |
|---|---|
| date | Sun, 20 Dec 2009 18:24:42 -0800 |
| parents | c5e9931c7ba7 |
| children | 2441327485a3 |
| files | ChangeLog acinclude.m4 configure.ac |
| diffstat | 3 files changed, 40 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Dec 20 17:02:57 2009 -0800 +++ b/ChangeLog Sun Dec 20 18:24:42 2009 -0800 @@ -1,3 +1,8 @@ +2009-12-20 Rik <octave@nomad.inbox5.com> + + * configure.ac, acinclude.m4: Better warnings when gnuplot is not + installed but native graphics are available + 2009-12-19 Rik <octave@nomad.inbox5.com> * emacs/module.mk, examples/Makefile.am, info-emacs-info,
--- a/acinclude.m4 Sun Dec 20 17:02:57 2009 -0800 +++ b/acinclude.m4 Sun Dec 20 18:24:42 2009 -0800 @@ -635,22 +635,9 @@ GNUPLOT="$gp_default" - ## If you change this text, be sure to also copy it to the set of - ## warnings at the end of the script - - AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) - AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) - AC_MSG_WARN([plotting commands without it.]) - AC_MSG_WARN([]) - AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can]) - AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary]) - AC_MSG_WARN([function. For example,]) - AC_MSG_WARN([]) - AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")]) - AC_MSG_WARN([]) - AC_MSG_WARN([at the Octave prompt.]) - AC_MSG_WARN([]) - AC_MSG_WARN([Setting default value to $GNUPLOT]) + AC_MSG_WARN([gnuplot not found. It isn't necessary to have gnuplot]) + AC_MSG_WARN([installed, but without native graphics or gnuplot]) + AC_MSG_WARN([you won't be able to use any of Octave's plotting commands.]) fi fi AC_SUBST(GNUPLOT)
--- a/configure.ac Sun Dec 20 17:02:57 2009 -0800 +++ b/configure.ac Sun Dec 20 18:24:42 2009 -0800 @@ -2390,29 +2390,6 @@ warn_msg_printed=true fi -if test -n "$warn_gnuplot"; then - - ## If you change this text, be sure to also change the corresponding - ## set of warnings above. - - AC_MSG_WARN([]) - AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) - AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) - AC_MSG_WARN([plotting commands without it.]) - AC_MSG_WARN([]) - AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can]) - AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary]) - AC_MSG_WARN([function. For example,]) - AC_MSG_WARN([]) - AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")]) - AC_MSG_WARN([]) - AC_MSG_WARN([at the Octave prompt.]) - AC_MSG_WARN([]) - AC_MSG_WARN([Setting default value to $GNUPLOT]) - AC_MSG_WARN([]) - warn_msg_printed=true -fi - if $USE_64_BIT_IDX_T; then AC_MSG_WARN([]) AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) @@ -2456,13 +2433,42 @@ else AC_MSG_WARN([]) AC_MSG_WARN([I didn't find the necessary libraries to compile native]) - AC_MSG_WARN([graphics. It isn't necessary to have native graphics]) - AC_MSG_WARN([but you will have to use gnuplot or you won't be able]) - AC_MSG_WARN([to use any of Octave's plotting commands]) + AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) + AC_MSG_WARN([but you will need to have gnuplot installed or you won't]) + AC_MSG_WARN([be able to use any of Octave's plotting commands]) AC_MSG_WARN([]) warn_msg_printed=true fi +if test -n "$warn_gnuplot"; then + if $native_graphics; then + AC_MSG_WARN([]) + AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) + AC_MSG_WARN([native graphics backend.]) + else + AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) + AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) + AC_MSG_WARN([plotting commands without it.]) + fi + AC_MSG_WARN([]) + AC_MSG_WARN([If gnuplot is installed, but isn't in your path, you can]) + AC_MSG_WARN([tell Octave where to find it by using the gnuplot_binary]) + AC_MSG_WARN([function. For example,]) + AC_MSG_WARN([]) + AC_MSG_WARN([gnuplot_binary ("/full/path/and/name/of/gnuplot/binary")]) + AC_MSG_WARN([]) + AC_MSG_WARN([at the Octave prompt.]) + AC_MSG_WARN([]) + AC_MSG_WARN([Setting default value to $GNUPLOT]) + AC_MSG_WARN([]) + + warn_msg_printed=true +fi + + + + + if $warn_msg_printed; then AC_MSG_NOTICE([]) AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR])