Mercurial > octave

comparison m4/acinclude.m4 @ 21381:e5d96f39a37d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
21380:460943554233 21381:e5d96f39a37d
620 [AS_HELP_STRING([--without-$1], [don't use $2 library])], 620 [AS_HELP_STRING([--without-$1], [don't use $2 library])],
621 [AS_HELP_STRING([--without-$1], [$7])])], 621 [AS_HELP_STRING([--without-$1], [$7])])],
622 with_$1=$withval, with_$1=yes) 622 with_$1=$withval, with_$1=yes)
623 623
624 m4_toupper([$1])_LIBS= 624 m4_toupper([$1])_LIBS=
625 warn_$1="$3"
625 case $with_$1 in 626 case $with_$1 in
626 no) 627 no)
628 warn_$1="--without-$1 specified. Functions or features that depend on $2 will be disabled."
627 m4_toupper([$1])_LIBS= 629 m4_toupper([$1])_LIBS=
628 ;; 630 ;;
629 yes | "") 631 yes | "")
630 m4_toupper([$1])_LIBS="-l$1" 632 m4_toupper([$1])_LIBS="-l$1"
631 ;; 633 ;;
634 ;; 636 ;;
635 *) 637 *)
636 m4_toupper([$1])_LIBS="-l$with_$1" 638 m4_toupper([$1])_LIBS="-l$with_$1"
637 ;; 639 ;;
638 esac 640 esac
639
640 warn_$1="$3"
641 m4_set_add([summary_warning_list], [warn_$1])
642 641
643 if test -n "$m4_toupper([$1])_LIBS"; then 642 if test -n "$m4_toupper([$1])_LIBS"; then
644 ac_octave_save_CPPFLAGS="$CPPFLAGS" 643 ac_octave_save_CPPFLAGS="$CPPFLAGS"
645 ac_octave_save_LDFLAGS="$LDFLAGS" 644 ac_octave_save_LDFLAGS="$LDFLAGS"
646 ac_octave_save_LIBS="$LIBS" 645 ac_octave_save_LIBS="$LIBS"
666 fi 665 fi
667 m4_ifnblank([$6], [AC_LANG_POP($6)]) 666 m4_ifnblank([$6], [AC_LANG_POP($6)])
668 CPPFLAGS="$ac_octave_save_CPPFLAGS" 667 CPPFLAGS="$ac_octave_save_CPPFLAGS"
669 LDFLAGS="$ac_octave_save_LDFLAGS" 668 LDFLAGS="$ac_octave_save_LDFLAGS"
670 LIBS="$ac_octave_save_LIBS" 669 LIBS="$ac_octave_save_LIBS"
670 else
671 octave_cv_lib_$1=no
671 fi 672 fi
672 673
673 AC_SUBST(m4_toupper([$1])_LIBS) 674 AC_SUBST(m4_toupper([$1])_LIBS)
674 if test -n "$warn_$1"; then 675 if test -n "$warn_$1"; then
675 AC_MSG_WARN([$warn_$1]) 676 OCTAVE_CONFIGURE_WARNING([warn_$1])
676 m4_toupper([$1])_LIBS= 677 m4_toupper([$1])_LIBS=
677 fi 678 fi
678 ]) 679 ])
679 dnl 680 dnl
680 dnl Check whether ARPACK works (does not crash). 681 dnl Check whether ARPACK works (does not crash).