Mercurial > hg > octave-nkf

diff 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
line wrap: on
line diff
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -370,10 +370,10 @@
     LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
     LIBS="$m4_toupper([$1])_LIBS $LIBS"
     m4_ifnblank([$6], [AC_LANG_PUSH($6)])
-    ac_octave_$1_check_for_lib=false
-    m4_ifblank([$4], [ac_octave_$1_check_for_lib=true],
-               [AC_CHECK_HEADERS([$4], [ac_octave_$1_check_for_lib=true; break])])
-    if $ac_octave_$1_check_for_lib; then
+    ac_octave_$1_check_for_lib=no
+    m4_ifblank([$4], [ac_octave_$1_check_for_lib=yes],
+               [AC_CHECK_HEADERS([$4], [ac_octave_$1_check_for_lib=yes; break])])
+    if test $ac_octave_$1_check_for_lib = yes; then
       AC_CACHE_CHECK([for $5 in $m4_toupper([$1])_LIBS],
         [octave_cv_lib_$1],
         [AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],
@@ -1159,16 +1159,16 @@
 dnl readline.
 dnl
 AC_DEFUN([OCTAVE_ENABLE_READLINE], [
-  USE_READLINE=true
+  USE_READLINE=yes
   READLINE_LIBS=
   AC_ARG_ENABLE([readline],
     [AS_HELP_STRING([--disable-readline],
       [use readline library])],
     [if test "$enableval" = no; then
-       USE_READLINE=false
+       USE_READLINE=no
        warn_readline="command editing and history features require GNU Readline"
      fi])
-  if $USE_READLINE; then
+  if test $USE_READLINE = yes; then
     dnl RHEL 5 and older systems require termlib set before enabling readline
     AC_REQUIRE([OCTAVE_CHECK_LIB_TERMLIB])
     ac_octave_save_LIBS="$LIBS"
@@ -1672,15 +1672,15 @@
   AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
   AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
   if test -z "$TEXI2PDF"; then
-    ac_octave_missing=true;
+    ac_octave_texi2pdf_missing=yes;
     if test -n "$TEXI2DVI"; then
       TEXI2PDF="$TEXI2DVI --pdf"
-      ac_octave_missing=false;
+      ac_octave_texi2pdf_missing=no;
     fi
   else
-    ac_octave_missing=false;
+    ac_octave_texi2pdf_missing=no;
   fi
-  if $ac_octave_missing; then
+  if test $ac_octave_texi2pdf_missing = yes; then
     TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf'
     warn_texi2pdf="