Mercurial > emacs
changeset 107424:d39dd3c90b0f
Check for tputs and friends, abort if not found (bug #5735)
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 18 Mar 2010 12:57:21 +0100 |
| parents | 8aeda91ab827 (current diff) 57a9e4b7b061 (diff) |
| children | 30e18a495cca |
| files | |
| diffstat | 2 files changed, 112 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Mar 17 23:47:12 2010 -0700 +++ b/configure Thu Mar 18 12:57:21 2010 +0100 @@ -21058,81 +21058,111 @@ # That is because we have not set up to link ncurses in lib-src. # It's better to believe a function is not available # than to expect to find it in ncurses. - -{ $as_echo "$as_me:$LINENO: checking for tparm in -lncurses" >&5 -$as_echo_n "checking for tparm in -lncurses... " >&6; } -if test "${ac_cv_lib_ncurses_tparm+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char tparm (); -int -main () -{ -return tparm (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ncurses_tparm=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ncurses_tparm=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5 -$as_echo "$ac_cv_lib_ncurses_tparm" >&6; } -if test $ac_cv_lib_ncurses_tparm = yes; then - cat >>confdefs.h <<_ACEOF +# Also we need tputs and frieds to be able to build at all. +have_tputs_et_al=true +{ $as_echo "$as_me:$LINENO: checking for library containing tputs" >&5 +$as_echo_n "checking for library containing tputs... " >&6; } +if test "${ac_cv_search_tputs+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tputs (); +int +main () +{ +return tputs (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ncurses terminfo termcap; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_tputs=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_tputs+set}" = set; then + break +fi +done +if test "${ac_cv_search_tputs+set}" = set; then + : +else + ac_cv_search_tputs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_tputs" >&5 +$as_echo "$ac_cv_search_tputs" >&6; } +ac_res=$ac_cv_search_tputs +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + have_tputs_et_al=false +fi + +if test "$have_tputs_et_al" != true; then + { { $as_echo "$as_me:$LINENO: error: I couldn't find termcap functions (tputs and friends). +Maybe some development libraries/packages are missing? Try installing +libncurses-dev(el), libterminfo-dev(el) or similar." >&5 +$as_echo "$as_me: error: I couldn't find termcap functions (tputs and friends). +Maybe some development libraries/packages are missing? Try installing +libncurses-dev(el), libterminfo-dev(el) or similar." >&2;} + { (exit 1); exit 1; }; } +fi +# Must define this when any termcap library is found. +cat >>confdefs.h <<\_ACEOF #define HAVE_LIBNCURSES 1 _ACEOF - LIBS="-lncurses $LIBS" - -fi - # Do we have res_init, for detecting changes in /etc/resolv.conf?
--- a/configure.in Wed Mar 17 23:47:12 2010 -0700 +++ b/configure.in Thu Mar 18 12:57:21 2010 +0100 @@ -2393,7 +2393,16 @@ # That is because we have not set up to link ncurses in lib-src. # It's better to believe a function is not available # than to expect to find it in ncurses. -AC_CHECK_LIB(ncurses, tparm) +# Also we need tputs and frieds to be able to build at all. +have_tputs_et_al=true +AC_SEARCH_LIBS(tputs, [ncurses terminfo termcap], , have_tputs_et_al=false) +if test "$have_tputs_et_al" != true; then + AC_MSG_ERROR([I couldn't find termcap functions (tputs and friends). +Maybe some development libraries/packages are missing? Try installing +libncurses-dev(el), libterminfo-dev(el) or similar.]) +fi +# Must define this when any termcap library is found. +AC_DEFINE(HAVE_LIBNCURSES) # Do we have res_init, for detecting changes in /etc/resolv.conf?