Mercurial > octave

comparison m4/acinclude.m4 @ 15338:dc39c1d84c5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Use caching on more intermediate results to speed up configure. * configure.ac (CURLOPT_DIRLISTONLY, Magick::ColorRGB, OpenGL in FLTK): Use AC_CACHE_CHECK in code to cache intermediate results. * acinclude.m4 (OCTAVE_CHECK_LIB_TERMLIB): Switch TERM_LIB search algorithm to use AC_SERCH_LIBS which caches results.
author Rik <rik@octave.org>
date Sun, 09 Sep 2012 12:31:19 -0700
parents 5fff79162342
children 6a0c0d3d60b6
comparison
equal deleted inserted replaced
15337:3f43e9d6d86e 15338:dc39c1d84c5b
681 dnl 681 dnl
682 dnl Find a suitable termlib to use. 682 dnl Find a suitable termlib to use.
683 dnl 683 dnl
684 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [ 684 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
685 TERM_LIBS= 685 TERM_LIBS=
686 ac_octave_found_termlib=no 686 ac_octave_save_LIBS="$LIBS"
687 for termlib in ncurses curses termcap terminfo termlib; do 687 AC_SEARCH_LIBS([tputs],
688 AC_CHECK_LIB([${termlib}], [tputs], [ 688 [ncurses curses termcap terminfo termlib],
689 TERM_LIBS="-l${termlib}" 689 [], [])
690 ac_octave_found_termlib=yes 690 LIBS="$ac_octave_save_LIBS"
691 break]) 691 case "$ac_cv_search_tputs" in
692 done 692 -l*)
693 693 TERM_LIBS="$ac_cv_search_tputs"
694 if test $ac_octave_found_termlib = no; then 694 ;;
695 warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" 695 no)
696 AC_MSG_WARN([$warn_termlibs]) 696 warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
697 fi 697 AC_MSG_WARN([$warn_termlibs])
698 ;;
699 esac
700
701 dnl Old code (9/9/2012). Delete when new code is definitely proven.
702 dnl
703 dnl for _termlib in ncurses curses termcap terminfo termlib; do
704 dnl AC_CHECK_LIB([${_termlib}], [tputs], [
705 dnl TERM_LIBS="-l${termlib}"
706 dnl octave_cv_lib_found_termlib=yes
707 dnl break])
708 dnl done
709
698 AC_SUBST(TERM_LIBS) 710 AC_SUBST(TERM_LIBS)
699 ]) 711 ])
700 dnl 712 dnl
701 dnl Check for support of OpenMP with a given compiler flag. 713 dnl Check for support of OpenMP with a given compiler flag.
702 dnl If found define HAVE_OPENMP and add the compile flag 714 dnl If found define HAVE_OPENMP and add the compile flag