Mercurial > octave
diff m4/acinclude.m4 @ 21381:e5d96f39a37d
configure script fixes
* configure.ac: Use AC_ARG_WITH for Qt. Adjust usage and error
message for --without-qt option.
Fix message for --without-opengl option.
Fix error message for GraphicsMagick library. Don't perform
GraphicsMagick library checks if --without-magick is specified.
Avoid quoting problem in setting AM_CONDITIONAL for QScintilla.
* acinclude.m4 (OCTAVE_CHECK_LIB): Provide separate error message if
the --without-LIB option is used.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 01 Mar 2016 02:27:13 -0500 |
| parents | 1487a68a496a |
| children | df859661e31e |
line wrap: on
line diff
--- a/m4/acinclude.m4 Tue Mar 01 01:25:02 2016 -0500 +++ b/m4/acinclude.m4 Tue Mar 01 02:27:13 2016 -0500 @@ -622,8 +622,10 @@ with_$1=$withval, with_$1=yes) m4_toupper([$1])_LIBS= + warn_$1="$3" case $with_$1 in no) + warn_$1="--without-$1 specified. Functions or features that depend on $2 will be disabled." m4_toupper([$1])_LIBS= ;; yes | "") @@ -637,9 +639,6 @@ ;; esac - warn_$1="$3" - m4_set_add([summary_warning_list], [warn_$1]) - if test -n "$m4_toupper([$1])_LIBS"; then ac_octave_save_CPPFLAGS="$CPPFLAGS" ac_octave_save_LDFLAGS="$LDFLAGS" @@ -668,11 +667,13 @@ CPPFLAGS="$ac_octave_save_CPPFLAGS" LDFLAGS="$ac_octave_save_LDFLAGS" LIBS="$ac_octave_save_LIBS" + else + octave_cv_lib_$1=no fi AC_SUBST(m4_toupper([$1])_LIBS) if test -n "$warn_$1"; then - AC_MSG_WARN([$warn_$1]) + OCTAVE_CONFIGURE_WARNING([warn_$1]) m4_toupper([$1])_LIBS= fi ])