Mercurial > octave-nkf
changeset 16068:b309a5da17f5
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 | 0df6c1c73e21 |
| children | 0486a29d780f |
| files | build-aux/common.mk configure.ac liboctave/cruft/mkf77def.in m4/acinclude.m4 |
| diffstat | 4 files changed, 130 insertions(+), 128 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk Sat Feb 16 19:00:08 2013 -0500 +++ b/build-aux/common.mk Sat Feb 16 22:21:13 2013 -0500 @@ -113,7 +113,7 @@ DEPEND_FLAGS = @DEPEND_FLAGS@ DEPEND_EXTRA_SED_PATTERN = @DEPEND_EXTRA_SED_PATTERN@ INCLUDE_DEPS = @INCLUDE_DEPS@ -# ifeq ($(INCLUDE_DEPS),false) +# ifeq ($(INCLUDE_DEPS),no) # omit_deps = true; # endif
--- a/configure.ac Sat Feb 16 19:00:08 2013 -0500 +++ b/configure.ac Sat Feb 16 22:21:13 2013 -0500 @@ -180,24 +180,24 @@ ### matrix classes. This slows down some operations a bit, so it is turned off ### by default. -BOUNDS_CHECKING=false +BOUNDS_CHECKING=no AC_ARG_ENABLE([bounds-check], [AS_HELP_STRING([--enable-bounds-check], [enable bounds checking for indexing in internal array classes])], - [if test "$enableval" = yes; then BOUNDS_CHECKING=true; fi], []) -if $BOUNDS_CHECKING; then + [if test "$enableval" = yes; then BOUNDS_CHECKING=yes; fi], []) +if test $BOUNDS_CHECKING = yes; then AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.]) fi ### Use Octave's built-in memory allocator rather than straightforward malloc. ### Disabled by default. -USE_OCTAVE_ALLOCATOR=false +USE_OCTAVE_ALLOCATOR=no AC_ARG_ENABLE([octave-allocator], [AS_HELP_STRING([--enable-octave-allocator], [use the obsolete octave_allocator class for many of Octave's objects (mostly octave_value types). You probably do NOT want to enable this feature.])], - [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=true; fi], []) -if $USE_OCTAVE_ALLOCATOR; then + [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=yes; fi], []) +if test $USE_OCTAVE_ALLOCATOR = yes; then AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, [Define to 1 to use octave_allocator class.]) fi @@ -206,12 +206,12 @@ ### for thread-safe behavior but incurs a significant slowdown, and is thus ### disabled by default. -USE_ATOMIC_REFCOUNT=false +USE_ATOMIC_REFCOUNT=no AC_ARG_ENABLE([atomic-refcount], [AS_HELP_STRING([--enable-atomic-refcount], [use atomic operations for internal reference counting. This is required for thread-safe behavior but does not by itself make Octave internals thread safe.])], - [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=true; fi], []) -if $USE_ATOMIC_REFCOUNT; then + [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=yes; fi], []) +if test $USE_ATOMIC_REFCOUNT = yes; then AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, [Define to 1 to use atomic operations for reference counting.]) fi @@ -232,13 +232,13 @@ ### If possible, use a 64-bit integer type for array dimensions and indexing. -USE_64_BIT_IDX_T=false +USE_64_BIT_IDX_T=no OCTAVE_IDX_TYPE=int AC_ARG_ENABLE(64, [AS_HELP_STRING([--enable-64], [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], - [if test "$enableval" = yes; then USE_64_BIT_IDX_T=true; fi], []) -if $USE_64_BIT_IDX_T; then + [if test "$enableval" = yes; then USE_64_BIT_IDX_T=yes; fi], []) +if test $USE_64_BIT_IDX_T = yes; then AC_CHECK_SIZEOF([void *]) AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([long]) @@ -251,18 +251,18 @@ else warn_64_bit="no suitable type found for octave_idx_type so disabling 64-bit features" OCTAVE_CONFIGURE_WARNING([warn_64_bit]) - USE_64_BIT_IDX_T=false + USE_64_BIT_IDX_T=no fi else warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features" OCTAVE_CONFIGURE_WARNING([warn_64_bit]) - USE_64_BIT_IDX_T=false + USE_64_BIT_IDX_T=no fi fi AC_SUBST(OCTAVE_IDX_TYPE) AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) -if $USE_64_BIT_IDX_T; then +if test $USE_64_BIT_IDX_T = yes; then AC_DEFINE(USE_64_BIT_IDX_T, 1, [Define to 1 if using 64-bit integers for array dimensions and indexing.]) fi @@ -350,7 +350,7 @@ ### Determine the compiler flag necessary to create dependencies ## Assume GCC. -INCLUDE_DEPS=true +INCLUDE_DEPS=yes DEPEND_FLAGS="-M" DEPEND_EXTRA_SED_PATTERN="" if test "$GCC" != yes; then @@ -363,11 +363,11 @@ ;; *-*-mingw*) if test $have_msvc = no; then - INCLUDE_DEPS=false + INCLUDE_DEPS=no fi ;; *) - INCLUDE_DEPS=false + INCLUDE_DEPS=no ;; esac fi @@ -466,12 +466,12 @@ ### Test whether the compiler supports OpenMP. This is experimental so disable ### it by default. Enable it with the flag --enable-openmp. -USE_OPENMP=false +USE_OPENMP=no AC_ARG_ENABLE([openmp], [AS_HELP_STRING([--enable-openmp], [(EXPERIMENTAL) use OpenMP SMP multi-threading])], - [if test "$enableval" = yes; then USE_OPENMP=true; fi], []) -if $USE_OPENMP; then + [if test "$enableval" = yes; then USE_OPENMP=yes; fi], []) +if test $USE_OPENMP = yes; then case $host_os in mingw* | cygwin* | *-gnu*) OCTAVE_CHECK_OPENMP(-fopenmp) @@ -538,18 +538,18 @@ AC_F77_DUMMY_MAIN AC_F77_WRAPPERS -F77_TOLOWER=true -F77_APPEND_UNDERSCORE=true -F77_APPEND_EXTRA_UNDERSCORE=true +F77_TOLOWER=yes +F77_APPEND_UNDERSCORE=yes +F77_APPEND_EXTRA_UNDERSCORE=yes case $ac_cv_f77_mangling in - "upper case") F77_TOLOWER=false ;; + "upper case") F77_TOLOWER=no ;; esac case $ac_cv_f77_mangling in - "no underscore") F77_APPEND_UNDERSCORE=false ;; + "no underscore") F77_APPEND_UNDERSCORE=no ;; esac case $ac_cv_f77_mangling in - "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=false ;; + "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;; esac case $canonical_host_type in @@ -593,7 +593,7 @@ OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER if test $octave_cv_sizeof_fortran_integer = no; then - if $USE_64_BIT_IDX_T; then + if test $USE_64_BIT_IDX_T = yes; then case $F77 in *gfortran*) case $F77_INTEGER_8_FLAG in @@ -703,12 +703,12 @@ ### Check for the LLVM library -build_jit=false +build_jit=no AC_ARG_ENABLE([jit], [AS_HELP_STRING([--enable-jit], [(EXPERIMENTAL) enable JIT compiler])], [if test "$enableval" = yes; then - build_jit=true + build_jit=yes fi], []) @@ -717,7 +717,7 @@ LLVM_LDFLAGS= LLVM_LIBS= -if test $build_jit = true; then +if test $build_jit = yes; then ## Find llvm-config program from environment variable or by searching AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility]) @@ -763,7 +763,7 @@ if test -z "$warn_llvm"; then AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) else - build_jit=false + build_jit=no LLVM_CPPFLAGS= LLVM_CXXFLAGS= LLVM_LDFLAGS= @@ -816,16 +816,16 @@ ## Check for the multithreaded FFTW library. ## Fallback to singlethreaded if not found or disabled -build_fftw_threads=true +build_fftw_threads=yes AC_ARG_ENABLE([fftw-threads], [AS_HELP_STRING([--disable-fftw-threads], [disable Multi-threaded FFTW])], [if test "$enableval" = no; then - build_fftw_threads=false + build_fftw_threads=no fi], []) -if test $build_fftw_threads = true; then +if test $build_fftw_threads = yes; then OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) fi @@ -977,24 +977,24 @@ ### Check for list of libraries needed for native graphics renderer. -native_graphics=true +native_graphics=yes warn_freetype="" -check_opengl=false +check_opengl=no AC_ARG_WITH([opengl], [AS_HELP_STRING([--without-opengl], [don't use OpenGL libraries, disable native graphics])], [if test x"$withval" = x"no"; then - native_graphics=false + native_graphics=no warn_opengl="--without-opengl specified. Native graphics will be disabled." OCTAVE_CONFIGURE_WARNING([warn_opengl]) else - check_opengl=true + check_opengl=yes fi], - [check_opengl=true]) + [check_opengl=yes]) ## Check for OpenGL library -if $check_opengl; then +if test $check_opengl = yes; then OCTAVE_CHECK_LIB_OPENGL fi @@ -1002,8 +1002,8 @@ GRAPHICS_CFLAGS= if test -z "$OPENGL_LIBS"; then - if $check_opengl; then - native_graphics=false + if test $check_opengl = yes; then + native_graphics=no warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled." OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) fi @@ -1030,7 +1030,7 @@ if test -n "$warn_freetype"; then OCTAVE_CONFIGURE_WARNING([warn_freetype]) - native_graphics=false + native_graphics=no fi ## Check for fontconfig library @@ -1047,7 +1047,7 @@ fi if test -n "$warn_fontconfig"; then - native_graphics=false + native_graphics=no OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) fi @@ -1085,7 +1085,7 @@ warn_fltk_opengl="" if test "$FLTK_CONFIG" = no; then - native_graphics=false + native_graphics=no warn_fltk_config="FLTK config script not found. Native graphics will be disabled." OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) else @@ -1121,7 +1121,7 @@ GRAPHICS_CFLAGS="$FLTK_CFLAGS" GRAPHICS_LIBS="$FLTK_LDFLAGS" else - native_graphics=false + native_graphics=no OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) fi fi @@ -1154,15 +1154,15 @@ LT_INIT([disable-static dlopen win32-dll]) if test x"$enable_shared" = x"yes"; then - SHARED_LIBS=true + SHARED_LIBS=yes else - SHARED_LIBS=false + SHARED_LIBS=no fi if test x"$enable_static" = x"yes"; then - STATIC_LIBS=true + STATIC_LIBS=yes else - STATIC_LIBS=false + STATIC_LIBS=no fi XTRA_CRUFT_SH_LDFLAGS= @@ -1244,7 +1244,7 @@ fi if test $ax_blas_f77_func_ok = no; then - if $USE_64_BIT_IDX_T && test $ax_blas_integer_size_ok = no; then + if test $USE_64_BIT_IDX_T = yes && test $ax_blas_integer_size_ok = no; then ## Attempt to be more informative. AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) else @@ -1432,13 +1432,13 @@ [AS_HELP_STRING([--disable-dl], [disable loading of dynamically linked modules])], [case $enableval in - yes) ENABLE_DYNAMIC_LINKING=true ;; - no) ENABLE_DYNAMIC_LINKING=false ;; + yes) ENABLE_DYNAMIC_LINKING=yes ;; + no) ENABLE_DYNAMIC_LINKING=no ;; *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;; esac], - [ENABLE_DYNAMIC_LINKING=true]) - -if ! $STATIC_LIBS && ! $SHARED_LIBS; then + [ENABLE_DYNAMIC_LINKING=no]) + +if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) fi @@ -1462,7 +1462,7 @@ DL_LDFLAGS='$(SH_LDFLAGS)' MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' SONAME_FLAGS= -NO_OCT_FILE_STRIP=false +NO_OCT_FILE_STRIP=no TEMPLATE_AR='$(AR)' TEMPLATE_ARFLAGS="$ARFLAGS" CRUFT_DLL_DEFS= @@ -1472,7 +1472,7 @@ OCTGRAPHICS_DLL_DEFS= library_path_var=LD_LIBRARY_PATH ldpreloadsep=" " -BUILD_COMPILED_AUX_PROGRAMS=false +BUILD_COMPILED_AUX_PROGRAMS=no case $canonical_host_type in *-*-386bsd* | *-*-netbsd*) SH_LD=ld @@ -1505,7 +1505,7 @@ SHLLIB='$(SHLEXT)' SHLEXT_VER='$(version).$(SHLEXT)' SHLLIB_VER='$(version).$(SHLLIB)' - NO_OCT_FILE_STRIP=true + NO_OCT_FILE_STRIP=yes SONAME_FLAGS='-install_name $(octlibdir)/$@' library_path_var=DYLD_LIBRARY_PATH ;; @@ -1525,7 +1525,7 @@ ldpreloadsep=":" ;; *-*-mingw*) - BUILD_COMPILED_AUX_PROGRAMS=true + BUILD_COMPILED_AUX_PROGRAMS=yes if test $have_msvc = yes; then DL_LDFLAGS="-shared" CPICFLAG= @@ -1543,9 +1543,8 @@ DL_LDFLAGS="$DL_LDFLAGS -g" SH_LDFLAGS="$SH_LDFLAGS -g" fi - NO_OCT_FILE_STRIP=true + NO_OCT_FILE_STRIP=yes library_path_var=PATH - NO_OCT_FILE_STRIP=true ## Extra compilation flags. CRUFT_DLL_DEFS="-DCRUFT_DLL" OCTAVE_DLL_DEFS="-DOCTAVE_DLL" @@ -1567,7 +1566,7 @@ ;; *-*-msdosmsvc) - BUILD_COMPILED_AUX_PROGRAMS=true + BUILD_COMPILED_AUX_PROGRAMS=yes DL_LDFLAGS="-shared" CPICFLAG= CXXPICFLAG= @@ -1584,9 +1583,8 @@ DL_LDFLAGS="$DL_LDFLAGS -g" SH_LDFLAGS="$SH_LDFLAGS -g" fi - NO_OCT_FILE_STRIP=true + NO_OCT_FILE_STRIP=yes library_path_var=PATH - NO_OCT_FILE_STRIP=true ## Extra compilation flags. CRUFT_DLL_DEFS="-DCRUFT_DLL" OCTAVE_DLL_DEFS="-DOCTAVE_DLL" @@ -1666,7 +1664,7 @@ esac AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], - [test x$BUILD_COMPILED_AUX_PROGRAMS = xtrue]) + [test $BUILD_COMPILED_AUX_PROGRAMS = yes]) AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) @@ -1745,13 +1743,13 @@ [AS_HELP_STRING([--enable-link-all-dependencies], [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], [case $enableval in - yes) link_all_deps=true ;; - no) link_all_deps=false ;; + yes) link_all_deps=yes ;; + no) link_all_deps=no ;; *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) ;; esac], - [link_all_deps=false]) -AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = true]) + [link_all_deps=no]) +AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) ## Dynamic linking is now enabled only if we are building shared ## libs and some API for dynamic linking has been detected. @@ -1762,35 +1760,35 @@ LD_CXX='$(CXX)' RDYNAMIC_FLAG= DL_API_MSG="" -dlopen_api=false -shl_load_api=false -loadlibrary_api=false -dyld_api=false - -if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKING; then +dlopen_api=no +shl_load_api=no +loadlibrary_api=no +dyld_api=no + +if test $SHARED_LIBS = yes || test $ENABLE_DYNAMIC_LINKING = yes; then case $lt_cv_dlopen in dlopen) - dlopen_api=true + dlopen_api=yes DL_API_MSG="(dlopen)" AC_DEFINE(HAVE_DLOPEN_API, 1, [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) ;; shl_load) - shl_load_api=true + shl_load_api=yes DL_API_MSG="(shl_load)" AC_DEFINE(HAVE_SHL_LOAD_API, 1, [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.]) ;; LoadLibrary) - loadlibrary_api=true + loadlibrary_api=yes DL_API_MSG="(LoadLibrary)" AC_DEFINE(HAVE_LOADLIBRARY_API, 1, [Define to 1 if your system has LoadLibrary for dynamic linking.]) ;; dyld) - dyld_api=true + dyld_api=yes DL_API_MSG="(dyld)" AC_DEFINE(HAVE_DYLD_API, 1, [Define to 1 if your system has dyld for dynamic linking.]) @@ -1801,21 +1799,25 @@ AC_SUBST(DL_LIBS) ## Disable dynamic linking if capability is not present. - if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then - : # some form of dynamic linking present + if test $dlopen_api = yes \ + || test $shl_load_api = yes \ + || test $loadlibrary_api = yes \ + || test $dyld_api = yes; then + # some form of dynamic linking present + ENABLE_DYNAMIC_LINKING=yes else - ENABLE_DYNAMIC_LINKING=false + ENABLE_DYNAMIC_LINKING=no fi fi -if $ENABLE_DYNAMIC_LINKING; then +if test $ENABLE_DYNAMIC_LINKING = yes; then AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.]) fi AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING], - [test x"$ENABLE_DYNAMIC_LINKING" = x"true"]) - -if $SHARED_LIBS; then + [test $ENABLE_DYNAMIC_LINKING = yes]) + +if test $SHARED_LIBS = yes; then LIBOCTINTERP="-loctinterp$SHLLINKEXT" LIBOCTAVE="-loctave$SHLLINKEXT" else @@ -2211,17 +2213,17 @@ GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" -try_extra_warning_flags=true +try_extra_warning_flags=yes AC_ARG_ENABLE([extra-warning-flags], [AS_HELP_STRING([--disable-extra-warning-flags], [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])], [if test "$enableval" = no; then - try_extra_warning_flags=false + try_extra_warning_flags=no fi], []) -if $try_extra_warning_flags; then +if test $try_extra_warning_flags = yes; then for flag in $GCC_EXTRA_FLAGS; do OCTAVE_CC_FLAG([$flag], [ WARN_CFLAGS="$WARN_CFLAGS $flag"; @@ -2238,17 +2240,17 @@ GXX_STRICT_FLAGS="-Wconversion -Weffc++" -try_strict_warning_flags=false +try_strict_warning_flags=no AC_ARG_ENABLE([strict-warning-flags], [AS_HELP_STRING([--enable-strict-warning-flags], [add extra strict warning options to CFLAGS and CXXFLAGS])], [if test "$enableval" = yes; then - try_strict_warning_flags=true + try_strict_warning_flags=yes fi], []) -if $try_strict_warning_flags; then +if test $try_strict_warning_flags = yes; then for flag in $GCC_STRICT_FLAGS; do OCTAVE_CC_FLAG([$flag], [ WARN_CFLAGS="$WARN_CFLAGS $flag"; @@ -2266,12 +2268,12 @@ ### Check for Java. -build_java=true +build_java=yes AC_ARG_ENABLE([java], [AS_HELP_STRING([--disable-java], [disable Java interface])], [if test "$enableval" = no; then - build_java=false + build_java=no fi], []) @@ -2302,10 +2304,10 @@ JAVA_LIBS= ## Fake loop so that "break" can be used to skip code blocks. -while test $build_java = true +while test $build_java = yes do ## Unset build_java. Variable is set only if all configuration tests pass. - build_java=false + build_java=no ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. if test -z "$JAVA_HOME"; then @@ -2384,7 +2386,7 @@ ## the required paths to compile and link against JDK. case $host_os in msdosmsvc) - build_java=true + build_java=yes JAVA_LIBS=-ladvapi32 AC_DEFINE(HAVE_JAVA, 1, [Define to 1 if Java is available and is at least version 1.5]) @@ -2392,7 +2394,7 @@ ;; mingw*) if test $have_msvc = yes; then - build_java=true + build_java=yes JAVA_LIBS=-ladvapi32 AC_DEFINE(HAVE_JAVA, 1, [Define to 1 if Java is available and is at least version 1.5]) @@ -2509,11 +2511,11 @@ ## Verify jni.h include file exists. JNI_PATH=`echo $JAVA_CPPFLAGS | sed -e 's/-I//g'` - have_jni=false + have_jni=no for dir in $JNI_PATH; do - if test -f "${dir}/jni.h"; then have_jni=true; break; fi + if test -f "${dir}/jni.h"; then have_jni=yes; break; fi done - if test $have_jni = true; then + if test $have_jni = yes; then AC_MSG_RESULT([$dir]) else AC_MSG_RESULT([not found]) @@ -2522,13 +2524,13 @@ fi ## Passed all configuration tests. A workable Java installation was found. - build_java=true + build_java=yes AC_DEFINE(HAVE_JAVA, 1, [Define to 1 if Java is available and is at least version 1.5]) break done -AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = true]) +AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes]) AC_SUBST(JAVA) AC_SUBST(JAVAC) AC_SUBST(JAR) @@ -2982,15 +2984,15 @@ OCTAVE_CONFIGURE_WARNING_SUMMARY -if $ENABLE_DYNAMIC_LINKING; then - if test $SHARED_LIBS = false; then +if test $ENABLE_DYNAMIC_LINKING = yes; then + if test $SHARED_LIBS = no; then AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) AC_MSG_WARN([Are you sure that is what you want to do?]) warn_msg_printed=true fi fi -if $USE_64_BIT_IDX_T; then +if test $USE_64_BIT_IDX_T = yes; then AC_MSG_WARN([]) AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) AC_MSG_WARN([Are you sure that is what you want to do?]) @@ -3007,7 +3009,7 @@ warn_msg_printed=true fi -if $USE_OPENMP; then +if test $USE_OPENMP = yes; then AC_MSG_WARN([]) AC_MSG_WARN([You used the EXPERIMENTAL --enable-openmp option.]) AC_MSG_WARN([Are you sure that is what you want to do?]) @@ -3020,7 +3022,7 @@ warn_msg_printed=true fi -if test $native_graphics = false; then +if test $native_graphics != yes; then AC_MSG_WARN([]) AC_MSG_WARN([I didn't find the necessary libraries to compile native]) AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) @@ -3031,7 +3033,7 @@ fi if test -n "$warn_gnuplot"; then - if $native_graphics; then + if test $native_graphics = yes; then AC_MSG_WARN([]) AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) AC_MSG_WARN([native graphics toolkit.]) @@ -3055,7 +3057,7 @@ warn_msg_printed=true fi -if $USE_ATOMIC_REFCOUNT; then +if test $USE_ATOMIC_REFCOUNT = yes; then AC_MSG_WARN([]) AC_MSG_WARN([Using atomic reference counting.]) AC_MSG_WARN([This feature allows access to Octave data safely from]) @@ -3063,7 +3065,7 @@ AC_MSG_WARN([results in a small performance penalty in the Octave]) AC_MSG_WARN([interpreter.]) AC_MSG_WARN([]) - if $USE_OCTAVE_ALLOCATOR; then + if test $USE_OCTAVE_ALLOCATOR = yes; then AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also]) AC_MSG_WARN([disable the use of the octave_allocator class.]) AC_MSG_WARN([])
--- a/liboctave/cruft/mkf77def.in Sat Feb 16 19:00:08 2013 -0500 +++ b/liboctave/cruft/mkf77def.in Sat Feb 16 22:21:13 2013 -0500 @@ -25,19 +25,19 @@ F77_APPEND_UNDERSCORE="@F77_APPEND_UNDERSCORE@" F77_APPEND_EXTRA_UNDERSCORE="@F77_APPEND_EXTRA_UNDERSCORE@" -if $F77_TOLOWER; then +if test x$F77_TOLOWER = xyes; then case_cmd="tolower"; else case_cmd="toupper"; fi -if $F77_APPEND_UNDERSCORE; then +if test x$F77_APPEND_UNDERSCORE = xyes; then uscore="_"; else uscore=""; fi -if $F77_APPEND_EXTRA_UNDERSCORE; then +if test x$F77_APPEND_EXTRA_UNDERSCORE = xyes; then awkcmd="$AWK '{ if (\$0 ~ /_/) extra = \"_\"; else extra = \"\"; printf (\"%s%s%s\n\", $case_cmd (\$0), \"$uscore\", extra); }'" else awkcmd="$AWK '{ printf (\"%s%s\n\", tolower (\$0), \"$uscore\"); }'"
--- a/m4/acinclude.m4 Sat Feb 16 19:00:08 2013 -0500 +++ b/m4/acinclude.m4 Sat Feb 16 22:21:13 2013 -0500 @@ -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="