Mercurial > octave-nkf

comparison m4/acinclude.m4 @ 16068:b309a5da17f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use yes/no instead of true/false in confgure scripts * acinclude.m4 (OCTAVE_CHECK_LIB, OCTAVE_ENABLE_READLINE, OCTAVE_PROG_TEXI2PDF): Use yes/no instead of true/false for consistency with autoconf macros. (OCTAVE_PROG_TEXI2PDF): Rename ac_octave_missing to ac_texi2pdf_missing. * configure.ac (BOUNDS_CHECKING, USE_OCTAVE_ALLOCATOR, USE_ATOMIC_REFCOUNT, USE_64_BIT_IDX_T, USE_OPENMP, F77_TOLOWER, F77_APPEND_UNDERSCORE, F77_APPEND_EXTRA_UNDERSCORE, build_jit, INCLUDE_DEPS, build_fftw_threads, native_graphics, check_opengl, SHARED_LIBS, STATIC_LIBS, ENABLE_DYNAMIC_LINKING, NO_OCT_FILE_STRIP, BUILD_COMPILED_AUX_PROGRAMS, link_all_deps, dlopen_api, shl_load_api, loadlibrary_api, dyld_api, try_extra_warning_flags, try_strict_warning_flags, build_java, have_jni): Use yes/no instead of true/false for consistency with autoconf macros. * liboctave/cruft/mk77def.in (F77_TOLOWER, F77_APPEND_UNDERSCORE, F77_APPEND_EXTRA_UNDERSCORE): Use yes/no instead of true false.
author John W. Eaton <jwe@octave.org>
date Sat, 16 Feb 2013 22:21:13 -0500
parents ca37c6023a79
children 39096b290a2f
comparison
equal deleted inserted replaced
16067:0df6c1c73e21 16068:b309a5da17f5
368 ac_octave_save_LIBS="$LIBS" 368 ac_octave_save_LIBS="$LIBS"
369 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" 369 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS"
370 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" 370 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
371 LIBS="$m4_toupper([$1])_LIBS $LIBS" 371 LIBS="$m4_toupper([$1])_LIBS $LIBS"
372 m4_ifnblank([$6], [AC_LANG_PUSH($6)]) 372 m4_ifnblank([$6], [AC_LANG_PUSH($6)])
373 ac_octave_$1_check_for_lib=false 373 ac_octave_$1_check_for_lib=no
374 m4_ifblank([$4], [ac_octave_$1_check_for_lib=true], 374 m4_ifblank([$4], [ac_octave_$1_check_for_lib=yes],
375 [AC_CHECK_HEADERS([$4], [ac_octave_$1_check_for_lib=true; break])]) 375 [AC_CHECK_HEADERS([$4], [ac_octave_$1_check_for_lib=yes; break])])
376 if $ac_octave_$1_check_for_lib; then 376 if test $ac_octave_$1_check_for_lib = yes; then
377 AC_CACHE_CHECK([for $5 in $m4_toupper([$1])_LIBS], 377 AC_CACHE_CHECK([for $5 in $m4_toupper([$1])_LIBS],
378 [octave_cv_lib_$1], 378 [octave_cv_lib_$1],
379 [AC_LINK_IFELSE([AC_LANG_CALL([], [$5])], 379 [AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],
380 [octave_cv_lib_$1=yes], [octave_cv_lib_$1=no]) 380 [octave_cv_lib_$1=yes], [octave_cv_lib_$1=no])
381 ]) 381 ])
1157 dnl 1157 dnl
1158 dnl Allow the user disable support for command line editing using GNU 1158 dnl Allow the user disable support for command line editing using GNU
1159 dnl readline. 1159 dnl readline.
1160 dnl 1160 dnl
1161 AC_DEFUN([OCTAVE_ENABLE_READLINE], [ 1161 AC_DEFUN([OCTAVE_ENABLE_READLINE], [
1162 USE_READLINE=true 1162 USE_READLINE=yes
1163 READLINE_LIBS= 1163 READLINE_LIBS=
1164 AC_ARG_ENABLE([readline], 1164 AC_ARG_ENABLE([readline],
1165 [AS_HELP_STRING([--disable-readline], 1165 [AS_HELP_STRING([--disable-readline],
1166 [use readline library])], 1166 [use readline library])],
1167 [if test "$enableval" = no; then 1167 [if test "$enableval" = no; then
1168 USE_READLINE=false 1168 USE_READLINE=no
1169 warn_readline="command editing and history features require GNU Readline" 1169 warn_readline="command editing and history features require GNU Readline"
1170 fi]) 1170 fi])
1171 if $USE_READLINE; then 1171 if test $USE_READLINE = yes; then
1172 dnl RHEL 5 and older systems require termlib set before enabling readline 1172 dnl RHEL 5 and older systems require termlib set before enabling readline
1173 AC_REQUIRE([OCTAVE_CHECK_LIB_TERMLIB]) 1173 AC_REQUIRE([OCTAVE_CHECK_LIB_TERMLIB])
1174 ac_octave_save_LIBS="$LIBS" 1174 ac_octave_save_LIBS="$LIBS"
1175 LIBS="$TERM_LIBS" 1175 LIBS="$TERM_LIBS"
1176 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout], 1176 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout],
1670 dnl 1670 dnl
1671 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [ 1671 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [
1672 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI]) 1672 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
1673 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, []) 1673 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
1674 if test -z "$TEXI2PDF"; then 1674 if test -z "$TEXI2PDF"; then
1675 ac_octave_missing=true; 1675 ac_octave_texi2pdf_missing=yes;
1676 if test -n "$TEXI2DVI"; then 1676 if test -n "$TEXI2DVI"; then
1677 TEXI2PDF="$TEXI2DVI --pdf" 1677 TEXI2PDF="$TEXI2DVI --pdf"
1678 ac_octave_missing=false; 1678 ac_octave_texi2pdf_missing=no;
1679 fi 1679 fi
1680 else 1680 else
1681 ac_octave_missing=false; 1681 ac_octave_texi2pdf_missing=no;
1682 fi 1682 fi
1683 if $ac_octave_missing; then 1683 if test $ac_octave_texi2pdf_missing = yes; then
1684 TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf' 1684 TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf'
1685 warn_texi2pdf=" 1685 warn_texi2pdf="
1686 1686
1687 I didn't find texi2pdf, but it's only a problem if you need to 1687 I didn't find texi2pdf, but it's only a problem if you need to
1688 reconstruct the PDF version of the manual 1688 reconstruct the PDF version of the manual