comparison configure.ac @ 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 9bfbe785e726
children 9439f3b5c5fa
comparison
equal deleted inserted replaced
16067:0df6c1c73e21 16068:b309a5da17f5
178 178
179 ### Enable bounds checking on element references within Octave's array and 179 ### Enable bounds checking on element references within Octave's array and
180 ### matrix classes. This slows down some operations a bit, so it is turned off 180 ### matrix classes. This slows down some operations a bit, so it is turned off
181 ### by default. 181 ### by default.
182 182
183 BOUNDS_CHECKING=false 183 BOUNDS_CHECKING=no
184 AC_ARG_ENABLE([bounds-check], 184 AC_ARG_ENABLE([bounds-check],
185 [AS_HELP_STRING([--enable-bounds-check], 185 [AS_HELP_STRING([--enable-bounds-check],
186 [enable bounds checking for indexing in internal array classes])], 186 [enable bounds checking for indexing in internal array classes])],
187 [if test "$enableval" = yes; then BOUNDS_CHECKING=true; fi], []) 187 [if test "$enableval" = yes; then BOUNDS_CHECKING=yes; fi], [])
188 if $BOUNDS_CHECKING; then 188 if test $BOUNDS_CHECKING = yes; then
189 AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.]) 189 AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.])
190 fi 190 fi
191 191
192 ### Use Octave's built-in memory allocator rather than straightforward malloc. 192 ### Use Octave's built-in memory allocator rather than straightforward malloc.
193 ### Disabled by default. 193 ### Disabled by default.
194 194
195 USE_OCTAVE_ALLOCATOR=false 195 USE_OCTAVE_ALLOCATOR=no
196 AC_ARG_ENABLE([octave-allocator], 196 AC_ARG_ENABLE([octave-allocator],
197 [AS_HELP_STRING([--enable-octave-allocator], 197 [AS_HELP_STRING([--enable-octave-allocator],
198 [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.])], 198 [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.])],
199 [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=true; fi], []) 199 [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=yes; fi], [])
200 if $USE_OCTAVE_ALLOCATOR; then 200 if test $USE_OCTAVE_ALLOCATOR = yes; then
201 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, 201 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1,
202 [Define to 1 to use octave_allocator class.]) 202 [Define to 1 to use octave_allocator class.])
203 fi 203 fi
204 204
205 ### Use atomic operations for internal reference counting. This is required 205 ### Use atomic operations for internal reference counting. This is required
206 ### for thread-safe behavior but incurs a significant slowdown, and is thus 206 ### for thread-safe behavior but incurs a significant slowdown, and is thus
207 ### disabled by default. 207 ### disabled by default.
208 208
209 USE_ATOMIC_REFCOUNT=false 209 USE_ATOMIC_REFCOUNT=no
210 AC_ARG_ENABLE([atomic-refcount], 210 AC_ARG_ENABLE([atomic-refcount],
211 [AS_HELP_STRING([--enable-atomic-refcount], 211 [AS_HELP_STRING([--enable-atomic-refcount],
212 [use atomic operations for internal reference counting. This is required for thread-safe behavior but does not by itself make Octave internals thread safe.])], 212 [use atomic operations for internal reference counting. This is required for thread-safe behavior but does not by itself make Octave internals thread safe.])],
213 [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=true; fi], []) 213 [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=yes; fi], [])
214 if $USE_ATOMIC_REFCOUNT; then 214 if test $USE_ATOMIC_REFCOUNT = yes; then
215 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, 215 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1,
216 [Define to 1 to use atomic operations for reference counting.]) 216 [Define to 1 to use atomic operations for reference counting.])
217 fi 217 fi
218 218
219 ### Disable running Make in the doc directory. 219 ### Disable running Make in the doc directory.
230 []) 230 [])
231 AC_SUBST(DOCDIR) 231 AC_SUBST(DOCDIR)
232 232
233 ### If possible, use a 64-bit integer type for array dimensions and indexing. 233 ### If possible, use a 64-bit integer type for array dimensions and indexing.
234 234
235 USE_64_BIT_IDX_T=false 235 USE_64_BIT_IDX_T=no
236 OCTAVE_IDX_TYPE=int 236 OCTAVE_IDX_TYPE=int
237 AC_ARG_ENABLE(64, 237 AC_ARG_ENABLE(64,
238 [AS_HELP_STRING([--enable-64], 238 [AS_HELP_STRING([--enable-64],
239 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], 239 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])],
240 [if test "$enableval" = yes; then USE_64_BIT_IDX_T=true; fi], []) 240 [if test "$enableval" = yes; then USE_64_BIT_IDX_T=yes; fi], [])
241 if $USE_64_BIT_IDX_T; then 241 if test $USE_64_BIT_IDX_T = yes; then
242 AC_CHECK_SIZEOF([void *]) 242 AC_CHECK_SIZEOF([void *])
243 AC_CHECK_SIZEOF([int]) 243 AC_CHECK_SIZEOF([int])
244 AC_CHECK_SIZEOF([long]) 244 AC_CHECK_SIZEOF([long])
245 if test $ac_cv_sizeof_void_p -eq 8; then 245 if test $ac_cv_sizeof_void_p -eq 8; then
246 if test $ac_cv_sizeof_int -eq 8; then 246 if test $ac_cv_sizeof_int -eq 8; then
249 OCTAVE_IDX_TYPE=long 249 OCTAVE_IDX_TYPE=long
250 AC_DEFINE(IDX_TYPE_LONG, 1, [Define to 1 if octave index type is long.]) 250 AC_DEFINE(IDX_TYPE_LONG, 1, [Define to 1 if octave index type is long.])
251 else 251 else
252 warn_64_bit="no suitable type found for octave_idx_type so disabling 64-bit features" 252 warn_64_bit="no suitable type found for octave_idx_type so disabling 64-bit features"
253 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) 253 OCTAVE_CONFIGURE_WARNING([warn_64_bit])
254 USE_64_BIT_IDX_T=false 254 USE_64_BIT_IDX_T=no
255 fi 255 fi
256 else 256 else
257 warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features" 257 warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features"
258 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) 258 OCTAVE_CONFIGURE_WARNING([warn_64_bit])
259 USE_64_BIT_IDX_T=false 259 USE_64_BIT_IDX_T=no
260 fi 260 fi
261 fi 261 fi
262 AC_SUBST(OCTAVE_IDX_TYPE) 262 AC_SUBST(OCTAVE_IDX_TYPE)
263 AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], 263 AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE],
264 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) 264 [Define to the type of octave_idx_type (64 or 32 bit signed integer).])
265 if $USE_64_BIT_IDX_T; then 265 if test $USE_64_BIT_IDX_T = yes; then
266 AC_DEFINE(USE_64_BIT_IDX_T, 1, 266 AC_DEFINE(USE_64_BIT_IDX_T, 1,
267 [Define to 1 if using 64-bit integers for array dimensions and indexing.]) 267 [Define to 1 if using 64-bit integers for array dimensions and indexing.])
268 fi 268 fi
269 AC_SUBST(USE_64_BIT_IDX_T) 269 AC_SUBST(USE_64_BIT_IDX_T)
270 270
348 AC_SUBST(GCC_VERSION) 348 AC_SUBST(GCC_VERSION)
349 349
350 ### Determine the compiler flag necessary to create dependencies 350 ### Determine the compiler flag necessary to create dependencies
351 351
352 ## Assume GCC. 352 ## Assume GCC.
353 INCLUDE_DEPS=true 353 INCLUDE_DEPS=yes
354 DEPEND_FLAGS="-M" 354 DEPEND_FLAGS="-M"
355 DEPEND_EXTRA_SED_PATTERN="" 355 DEPEND_EXTRA_SED_PATTERN=""
356 if test "$GCC" != yes; then 356 if test "$GCC" != yes; then
357 case $canonical_host_type in 357 case $canonical_host_type in
358 sparc-sun-solaris2* | i386-pc-solaris2*) 358 sparc-sun-solaris2* | i386-pc-solaris2*)
361 ;; 361 ;;
362 *-*-msdosmsvc) 362 *-*-msdosmsvc)
363 ;; 363 ;;
364 *-*-mingw*) 364 *-*-mingw*)
365 if test $have_msvc = no; then 365 if test $have_msvc = no; then
366 INCLUDE_DEPS=false 366 INCLUDE_DEPS=no
367 fi 367 fi
368 ;; 368 ;;
369 *) 369 *)
370 INCLUDE_DEPS=false 370 INCLUDE_DEPS=no
371 ;; 371 ;;
372 esac 372 esac
373 fi 373 fi
374 AC_SUBST(INCLUDE_DEPS) 374 AC_SUBST(INCLUDE_DEPS)
375 AC_SUBST(DEPEND_FLAGS) 375 AC_SUBST(DEPEND_FLAGS)
464 AC_SUBST(XTRA_CXXFLAGS) 464 AC_SUBST(XTRA_CXXFLAGS)
465 465
466 ### Test whether the compiler supports OpenMP. This is experimental so disable 466 ### Test whether the compiler supports OpenMP. This is experimental so disable
467 ### it by default. Enable it with the flag --enable-openmp. 467 ### it by default. Enable it with the flag --enable-openmp.
468 468
469 USE_OPENMP=false 469 USE_OPENMP=no
470 AC_ARG_ENABLE([openmp], 470 AC_ARG_ENABLE([openmp],
471 [AS_HELP_STRING([--enable-openmp], 471 [AS_HELP_STRING([--enable-openmp],
472 [(EXPERIMENTAL) use OpenMP SMP multi-threading])], 472 [(EXPERIMENTAL) use OpenMP SMP multi-threading])],
473 [if test "$enableval" = yes; then USE_OPENMP=true; fi], []) 473 [if test "$enableval" = yes; then USE_OPENMP=yes; fi], [])
474 if $USE_OPENMP; then 474 if test $USE_OPENMP = yes; then
475 case $host_os in 475 case $host_os in
476 mingw* | cygwin* | *-gnu*) 476 mingw* | cygwin* | *-gnu*)
477 OCTAVE_CHECK_OPENMP(-fopenmp) 477 OCTAVE_CHECK_OPENMP(-fopenmp)
478 ;; 478 ;;
479 msdosmsvc) 479 msdosmsvc)
536 AC_PROG_F77 536 AC_PROG_F77
537 AC_F77_LIBRARY_LDFLAGS 537 AC_F77_LIBRARY_LDFLAGS
538 AC_F77_DUMMY_MAIN 538 AC_F77_DUMMY_MAIN
539 AC_F77_WRAPPERS 539 AC_F77_WRAPPERS
540 540
541 F77_TOLOWER=true 541 F77_TOLOWER=yes
542 F77_APPEND_UNDERSCORE=true 542 F77_APPEND_UNDERSCORE=yes
543 F77_APPEND_EXTRA_UNDERSCORE=true 543 F77_APPEND_EXTRA_UNDERSCORE=yes
544 544
545 case $ac_cv_f77_mangling in 545 case $ac_cv_f77_mangling in
546 "upper case") F77_TOLOWER=false ;; 546 "upper case") F77_TOLOWER=no ;;
547 esac 547 esac
548 case $ac_cv_f77_mangling in 548 case $ac_cv_f77_mangling in
549 "no underscore") F77_APPEND_UNDERSCORE=false ;; 549 "no underscore") F77_APPEND_UNDERSCORE=no ;;
550 esac 550 esac
551 case $ac_cv_f77_mangling in 551 case $ac_cv_f77_mangling in
552 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=false ;; 552 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;;
553 esac 553 esac
554 554
555 case $canonical_host_type in 555 case $canonical_host_type in
556 i[[3456789]]86-*-*) 556 i[[3456789]]86-*-*)
557 if test $ac_cv_f77_compiler_gnu = yes; then 557 if test $ac_cv_f77_compiler_gnu = yes; then
591 fi 591 fi
592 AC_SUBST(F77_ISNAN_MACRO) 592 AC_SUBST(F77_ISNAN_MACRO)
593 593
594 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER 594 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER
595 if test $octave_cv_sizeof_fortran_integer = no; then 595 if test $octave_cv_sizeof_fortran_integer = no; then
596 if $USE_64_BIT_IDX_T; then 596 if test $USE_64_BIT_IDX_T = yes; then
597 case $F77 in 597 case $F77 in
598 *gfortran*) 598 *gfortran*)
599 case $F77_INTEGER_8_FLAG in 599 case $F77_INTEGER_8_FLAG in
600 *-fdefault-integer-8*) 600 *-fdefault-integer-8*)
601 ;; 601 ;;
701 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], 701 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.],
702 [zlib.h], [gzclearerr]) 702 [zlib.h], [gzclearerr])
703 703
704 ### Check for the LLVM library 704 ### Check for the LLVM library
705 705
706 build_jit=false 706 build_jit=no
707 AC_ARG_ENABLE([jit], 707 AC_ARG_ENABLE([jit],
708 [AS_HELP_STRING([--enable-jit], 708 [AS_HELP_STRING([--enable-jit],
709 [(EXPERIMENTAL) enable JIT compiler])], 709 [(EXPERIMENTAL) enable JIT compiler])],
710 [if test "$enableval" = yes; then 710 [if test "$enableval" = yes; then
711 build_jit=true 711 build_jit=yes
712 fi], 712 fi],
713 []) 713 [])
714 714
715 LLVM_CXXFLAGS= 715 LLVM_CXXFLAGS=
716 LLVM_CPPFLAGS= 716 LLVM_CPPFLAGS=
717 LLVM_LDFLAGS= 717 LLVM_LDFLAGS=
718 LLVM_LIBS= 718 LLVM_LIBS=
719 719
720 if test $build_jit = true; then 720 if test $build_jit = yes; then
721 721
722 ## Find llvm-config program from environment variable or by searching 722 ## Find llvm-config program from environment variable or by searching
723 AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility]) 723 AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility])
724 AC_CHECK_PROG([LLVM_CONFIG], llvm-config, llvm-config, []) 724 AC_CHECK_PROG([LLVM_CONFIG], llvm-config, llvm-config, [])
725 725
761 fi 761 fi
762 762
763 if test -z "$warn_llvm"; then 763 if test -z "$warn_llvm"; then
764 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) 764 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.])
765 else 765 else
766 build_jit=false 766 build_jit=no
767 LLVM_CPPFLAGS= 767 LLVM_CPPFLAGS=
768 LLVM_CXXFLAGS= 768 LLVM_CXXFLAGS=
769 LLVM_LDFLAGS= 769 LLVM_LDFLAGS=
770 LLVM_LIBS= 770 LLVM_LIBS=
771 OCTAVE_CONFIGURE_WARNING([warn_llvm]) 771 OCTAVE_CONFIGURE_WARNING([warn_llvm])
814 [FFTW3F library not found. The slower FFTPACK library will be used instead.], 814 [FFTW3F library not found. The slower FFTPACK library will be used instead.],
815 [fftw3.h], [fftwf_plan_dft_1d]) 815 [fftw3.h], [fftwf_plan_dft_1d])
816 816
817 ## Check for the multithreaded FFTW library. 817 ## Check for the multithreaded FFTW library.
818 ## Fallback to singlethreaded if not found or disabled 818 ## Fallback to singlethreaded if not found or disabled
819 build_fftw_threads=true 819 build_fftw_threads=yes
820 AC_ARG_ENABLE([fftw-threads], 820 AC_ARG_ENABLE([fftw-threads],
821 [AS_HELP_STRING([--disable-fftw-threads], 821 [AS_HELP_STRING([--disable-fftw-threads],
822 [disable Multi-threaded FFTW])], 822 [disable Multi-threaded FFTW])],
823 [if test "$enableval" = no; then 823 [if test "$enableval" = no; then
824 build_fftw_threads=false 824 build_fftw_threads=no
825 fi], 825 fi],
826 []) 826 [])
827 827
828 if test $build_fftw_threads = true; then 828 if test $build_fftw_threads = yes; then
829 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) 829 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads)
830 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) 830 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads)
831 fi 831 fi
832 832
833 AM_CONDITIONAL([AMCOND_HAVE_FFTW], 833 AM_CONDITIONAL([AMCOND_HAVE_FFTW],
975 AC_SUBST(CARBON_LIBS) 975 AC_SUBST(CARBON_LIBS)
976 fi 976 fi
977 977
978 ### Check for list of libraries needed for native graphics renderer. 978 ### Check for list of libraries needed for native graphics renderer.
979 979
980 native_graphics=true 980 native_graphics=yes
981 warn_freetype="" 981 warn_freetype=""
982 982
983 check_opengl=false 983 check_opengl=no
984 AC_ARG_WITH([opengl], 984 AC_ARG_WITH([opengl],
985 [AS_HELP_STRING([--without-opengl], 985 [AS_HELP_STRING([--without-opengl],
986 [don't use OpenGL libraries, disable native graphics])], 986 [don't use OpenGL libraries, disable native graphics])],
987 [if test x"$withval" = x"no"; then 987 [if test x"$withval" = x"no"; then
988 native_graphics=false 988 native_graphics=no
989 warn_opengl="--without-opengl specified. Native graphics will be disabled." 989 warn_opengl="--without-opengl specified. Native graphics will be disabled."
990 OCTAVE_CONFIGURE_WARNING([warn_opengl]) 990 OCTAVE_CONFIGURE_WARNING([warn_opengl])
991 else 991 else
992 check_opengl=true 992 check_opengl=yes
993 fi], 993 fi],
994 [check_opengl=true]) 994 [check_opengl=yes])
995 995
996 ## Check for OpenGL library 996 ## Check for OpenGL library
997 if $check_opengl; then 997 if test $check_opengl = yes; then
998 OCTAVE_CHECK_LIB_OPENGL 998 OCTAVE_CHECK_LIB_OPENGL
999 fi 999 fi
1000 1000
1001 GRAPHICS_LIBS= 1001 GRAPHICS_LIBS=
1002 GRAPHICS_CFLAGS= 1002 GRAPHICS_CFLAGS=
1003 1003
1004 if test -z "$OPENGL_LIBS"; then 1004 if test -z "$OPENGL_LIBS"; then
1005 if $check_opengl; then 1005 if test $check_opengl = yes; then
1006 native_graphics=false 1006 native_graphics=no
1007 warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled." 1007 warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled."
1008 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) 1008 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl])
1009 fi 1009 fi
1010 fi 1010 fi
1011 1011
1028 warn_freetype="FreeType library not found. Native graphics will be disabled." 1028 warn_freetype="FreeType library not found. Native graphics will be disabled."
1029 fi]) 1029 fi])
1030 1030
1031 if test -n "$warn_freetype"; then 1031 if test -n "$warn_freetype"; then
1032 OCTAVE_CONFIGURE_WARNING([warn_freetype]) 1032 OCTAVE_CONFIGURE_WARNING([warn_freetype])
1033 native_graphics=false 1033 native_graphics=no
1034 fi 1034 fi
1035 1035
1036 ## Check for fontconfig library 1036 ## Check for fontconfig library
1037 1037
1038 warn_fontconfig="" 1038 warn_fontconfig=""
1045 [have_fontconfig=no 1045 [have_fontconfig=no
1046 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."]) 1046 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."])
1047 fi 1047 fi
1048 1048
1049 if test -n "$warn_fontconfig"; then 1049 if test -n "$warn_fontconfig"; then
1050 native_graphics=false 1050 native_graphics=no
1051 OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) 1051 OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
1052 fi 1052 fi
1053 1053
1054 ## Check for FLTK (www.fltk.org) library 1054 ## Check for FLTK (www.fltk.org) library
1055 1055
1083 1083
1084 warn_fltk_config="" 1084 warn_fltk_config=""
1085 warn_fltk_opengl="" 1085 warn_fltk_opengl=""
1086 1086
1087 if test "$FLTK_CONFIG" = no; then 1087 if test "$FLTK_CONFIG" = no; then
1088 native_graphics=false 1088 native_graphics=no
1089 warn_fltk_config="FLTK config script not found. Native graphics will be disabled." 1089 warn_fltk_config="FLTK config script not found. Native graphics will be disabled."
1090 OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) 1090 OCTAVE_CONFIGURE_WARNING([warn_fltk_config])
1091 else 1091 else
1092 FLTK_CFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` 1092 FLTK_CFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`
1093 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` 1093 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`
1119 1119
1120 if test -z "$warn_fltk_opengl"; then 1120 if test -z "$warn_fltk_opengl"; then
1121 GRAPHICS_CFLAGS="$FLTK_CFLAGS" 1121 GRAPHICS_CFLAGS="$FLTK_CFLAGS"
1122 GRAPHICS_LIBS="$FLTK_LDFLAGS" 1122 GRAPHICS_LIBS="$FLTK_LDFLAGS"
1123 else 1123 else
1124 native_graphics=false 1124 native_graphics=no
1125 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) 1125 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl])
1126 fi 1126 fi
1127 fi 1127 fi
1128 fi 1128 fi
1129 1129
1152 1152
1153 LT_PREREQ([2.2.2]) 1153 LT_PREREQ([2.2.2])
1154 LT_INIT([disable-static dlopen win32-dll]) 1154 LT_INIT([disable-static dlopen win32-dll])
1155 1155
1156 if test x"$enable_shared" = x"yes"; then 1156 if test x"$enable_shared" = x"yes"; then
1157 SHARED_LIBS=true 1157 SHARED_LIBS=yes
1158 else 1158 else
1159 SHARED_LIBS=false 1159 SHARED_LIBS=no
1160 fi 1160 fi
1161 1161
1162 if test x"$enable_static" = x"yes"; then 1162 if test x"$enable_static" = x"yes"; then
1163 STATIC_LIBS=true 1163 STATIC_LIBS=yes
1164 else 1164 else
1165 STATIC_LIBS=false 1165 STATIC_LIBS=no
1166 fi 1166 fi
1167 1167
1168 XTRA_CRUFT_SH_LDFLAGS= 1168 XTRA_CRUFT_SH_LDFLAGS=
1169 if test $have_msvc = yes; then 1169 if test $have_msvc = yes; then
1170 FLIBS="$FLIBS -lkernel32" 1170 FLIBS="$FLIBS -lkernel32"
1242 ;; 1242 ;;
1243 esac 1243 esac
1244 fi 1244 fi
1245 1245
1246 if test $ax_blas_f77_func_ok = no; then 1246 if test $ax_blas_f77_func_ok = no; then
1247 if $USE_64_BIT_IDX_T && test $ax_blas_integer_size_ok = no; then 1247 if test $USE_64_BIT_IDX_T = yes && test $ax_blas_integer_size_ok = no; then
1248 ## Attempt to be more informative. 1248 ## Attempt to be more informative.
1249 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) 1249 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.])
1250 else 1250 else
1251 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) 1251 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.])
1252 fi 1252 fi
1430 1430
1431 AC_ARG_ENABLE([dl], 1431 AC_ARG_ENABLE([dl],
1432 [AS_HELP_STRING([--disable-dl], 1432 [AS_HELP_STRING([--disable-dl],
1433 [disable loading of dynamically linked modules])], 1433 [disable loading of dynamically linked modules])],
1434 [case $enableval in 1434 [case $enableval in
1435 yes) ENABLE_DYNAMIC_LINKING=true ;; 1435 yes) ENABLE_DYNAMIC_LINKING=yes ;;
1436 no) ENABLE_DYNAMIC_LINKING=false ;; 1436 no) ENABLE_DYNAMIC_LINKING=no ;;
1437 *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;; 1437 *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;;
1438 esac], 1438 esac],
1439 [ENABLE_DYNAMIC_LINKING=true]) 1439 [ENABLE_DYNAMIC_LINKING=no])
1440 1440
1441 if ! $STATIC_LIBS && ! $SHARED_LIBS; then 1441 if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then
1442 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) 1442 AC_MSG_ERROR([You can't disable building both static AND shared libraries!])
1443 fi 1443 fi
1444 1444
1445 CPICFLAG=-fPIC 1445 CPICFLAG=-fPIC
1446 CXXPICFLAG=-fPIC 1446 CXXPICFLAG=-fPIC
1460 SH_LDFLAGS=-shared 1460 SH_LDFLAGS=-shared
1461 DL_LD='$(SH_LD)' 1461 DL_LD='$(SH_LD)'
1462 DL_LDFLAGS='$(SH_LDFLAGS)' 1462 DL_LDFLAGS='$(SH_LDFLAGS)'
1463 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' 1463 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
1464 SONAME_FLAGS= 1464 SONAME_FLAGS=
1465 NO_OCT_FILE_STRIP=false 1465 NO_OCT_FILE_STRIP=no
1466 TEMPLATE_AR='$(AR)' 1466 TEMPLATE_AR='$(AR)'
1467 TEMPLATE_ARFLAGS="$ARFLAGS" 1467 TEMPLATE_ARFLAGS="$ARFLAGS"
1468 CRUFT_DLL_DEFS= 1468 CRUFT_DLL_DEFS=
1469 OCTAVE_DLL_DEFS= 1469 OCTAVE_DLL_DEFS=
1470 OCTINTERP_DLL_DEFS= 1470 OCTINTERP_DLL_DEFS=
1471 OCTGUI_DLL_DEFS= 1471 OCTGUI_DLL_DEFS=
1472 OCTGRAPHICS_DLL_DEFS= 1472 OCTGRAPHICS_DLL_DEFS=
1473 library_path_var=LD_LIBRARY_PATH 1473 library_path_var=LD_LIBRARY_PATH
1474 ldpreloadsep=" " 1474 ldpreloadsep=" "
1475 BUILD_COMPILED_AUX_PROGRAMS=false 1475 BUILD_COMPILED_AUX_PROGRAMS=no
1476 case $canonical_host_type in 1476 case $canonical_host_type in
1477 *-*-386bsd* | *-*-netbsd*) 1477 *-*-386bsd* | *-*-netbsd*)
1478 SH_LD=ld 1478 SH_LD=ld
1479 SH_LDFLAGS=-Bshareable 1479 SH_LDFLAGS=-Bshareable
1480 ;; 1480 ;;
1503 esac 1503 esac
1504 SHLEXT=dylib 1504 SHLEXT=dylib
1505 SHLLIB='$(SHLEXT)' 1505 SHLLIB='$(SHLEXT)'
1506 SHLEXT_VER='$(version).$(SHLEXT)' 1506 SHLEXT_VER='$(version).$(SHLEXT)'
1507 SHLLIB_VER='$(version).$(SHLLIB)' 1507 SHLLIB_VER='$(version).$(SHLLIB)'
1508 NO_OCT_FILE_STRIP=true 1508 NO_OCT_FILE_STRIP=yes
1509 SONAME_FLAGS='-install_name $(octlibdir)/$@' 1509 SONAME_FLAGS='-install_name $(octlibdir)/$@'
1510 library_path_var=DYLD_LIBRARY_PATH 1510 library_path_var=DYLD_LIBRARY_PATH
1511 ;; 1511 ;;
1512 *-*-cygwin*) 1512 *-*-cygwin*)
1513 CPICFLAG= 1513 CPICFLAG=
1523 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" 1523 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
1524 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' 1524 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a'
1525 ldpreloadsep=":" 1525 ldpreloadsep=":"
1526 ;; 1526 ;;
1527 *-*-mingw*) 1527 *-*-mingw*)
1528 BUILD_COMPILED_AUX_PROGRAMS=true 1528 BUILD_COMPILED_AUX_PROGRAMS=yes
1529 if test $have_msvc = yes; then 1529 if test $have_msvc = yes; then
1530 DL_LDFLAGS="-shared" 1530 DL_LDFLAGS="-shared"
1531 CPICFLAG= 1531 CPICFLAG=
1532 CXXPICFLAG= 1532 CXXPICFLAG=
1533 FPICFLAG= 1533 FPICFLAG=
1541 SH_LDFLAGS="-shared" 1541 SH_LDFLAGS="-shared"
1542 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then 1542 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then
1543 DL_LDFLAGS="$DL_LDFLAGS -g" 1543 DL_LDFLAGS="$DL_LDFLAGS -g"
1544 SH_LDFLAGS="$SH_LDFLAGS -g" 1544 SH_LDFLAGS="$SH_LDFLAGS -g"
1545 fi 1545 fi
1546 NO_OCT_FILE_STRIP=true 1546 NO_OCT_FILE_STRIP=yes
1547 library_path_var=PATH 1547 library_path_var=PATH
1548 NO_OCT_FILE_STRIP=true
1549 ## Extra compilation flags. 1548 ## Extra compilation flags.
1550 CRUFT_DLL_DEFS="-DCRUFT_DLL" 1549 CRUFT_DLL_DEFS="-DCRUFT_DLL"
1551 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" 1550 OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
1552 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" 1551 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL"
1553 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" 1552 OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
1565 library_path_var=PATH 1564 library_path_var=PATH
1566 fi 1565 fi
1567 ;; 1566 ;;
1568 1567
1569 *-*-msdosmsvc) 1568 *-*-msdosmsvc)
1570 BUILD_COMPILED_AUX_PROGRAMS=true 1569 BUILD_COMPILED_AUX_PROGRAMS=yes
1571 DL_LDFLAGS="-shared" 1570 DL_LDFLAGS="-shared"
1572 CPICFLAG= 1571 CPICFLAG=
1573 CXXPICFLAG= 1572 CXXPICFLAG=
1574 FPICFLAG= 1573 FPICFLAG=
1575 SHLEXT=dll 1574 SHLEXT=dll
1582 SH_LDFLAGS="-shared" 1581 SH_LDFLAGS="-shared"
1583 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then 1582 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then
1584 DL_LDFLAGS="$DL_LDFLAGS -g" 1583 DL_LDFLAGS="$DL_LDFLAGS -g"
1585 SH_LDFLAGS="$SH_LDFLAGS -g" 1584 SH_LDFLAGS="$SH_LDFLAGS -g"
1586 fi 1585 fi
1587 NO_OCT_FILE_STRIP=true 1586 NO_OCT_FILE_STRIP=yes
1588 library_path_var=PATH 1587 library_path_var=PATH
1589 NO_OCT_FILE_STRIP=true
1590 ## Extra compilation flags. 1588 ## Extra compilation flags.
1591 CRUFT_DLL_DEFS="-DCRUFT_DLL" 1589 CRUFT_DLL_DEFS="-DCRUFT_DLL"
1592 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" 1590 OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
1593 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" 1591 OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
1594 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" 1592 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
1664 fi 1662 fi
1665 ;; 1663 ;;
1666 esac 1664 esac
1667 1665
1668 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], 1666 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS],
1669 [test x$BUILD_COMPILED_AUX_PROGRAMS = xtrue]) 1667 [test $BUILD_COMPILED_AUX_PROGRAMS = yes])
1670 1668
1671 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) 1669 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
1672 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) 1670 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
1673 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) 1671 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
1674 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) 1672 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT])
1743 1741
1744 AC_ARG_ENABLE([link-all-dependencies], 1742 AC_ARG_ENABLE([link-all-dependencies],
1745 [AS_HELP_STRING([--enable-link-all-dependencies], 1743 [AS_HELP_STRING([--enable-link-all-dependencies],
1746 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], 1744 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])],
1747 [case $enableval in 1745 [case $enableval in
1748 yes) link_all_deps=true ;; 1746 yes) link_all_deps=yes ;;
1749 no) link_all_deps=false ;; 1747 no) link_all_deps=no ;;
1750 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) 1748 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies])
1751 ;; 1749 ;;
1752 esac], 1750 esac],
1753 [link_all_deps=false]) 1751 [link_all_deps=no])
1754 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = true]) 1752 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes])
1755 1753
1756 ## Dynamic linking is now enabled only if we are building shared 1754 ## Dynamic linking is now enabled only if we are building shared
1757 ## libs and some API for dynamic linking has been detected. 1755 ## libs and some API for dynamic linking has been detected.
1758 1756
1759 ## FIXME: A lot of the following duplicates the functionality of 1757 ## FIXME: A lot of the following duplicates the functionality of
1760 ## code generated by the dlopen option for LT_INIT. 1758 ## code generated by the dlopen option for LT_INIT.
1761 1759
1762 LD_CXX='$(CXX)' 1760 LD_CXX='$(CXX)'
1763 RDYNAMIC_FLAG= 1761 RDYNAMIC_FLAG=
1764 DL_API_MSG="" 1762 DL_API_MSG=""
1765 dlopen_api=false 1763 dlopen_api=no
1766 shl_load_api=false 1764 shl_load_api=no
1767 loadlibrary_api=false 1765 loadlibrary_api=no
1768 dyld_api=false 1766 dyld_api=no
1769 1767
1770 if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKING; then 1768 if test $SHARED_LIBS = yes || test $ENABLE_DYNAMIC_LINKING = yes; then
1771 1769
1772 case $lt_cv_dlopen in 1770 case $lt_cv_dlopen in
1773 dlopen) 1771 dlopen)
1774 dlopen_api=true 1772 dlopen_api=yes
1775 DL_API_MSG="(dlopen)" 1773 DL_API_MSG="(dlopen)"
1776 AC_DEFINE(HAVE_DLOPEN_API, 1, 1774 AC_DEFINE(HAVE_DLOPEN_API, 1,
1777 [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) 1775 [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.])
1778 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) 1776 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic])
1779 ;; 1777 ;;
1780 shl_load) 1778 shl_load)
1781 shl_load_api=true 1779 shl_load_api=yes
1782 DL_API_MSG="(shl_load)" 1780 DL_API_MSG="(shl_load)"
1783 AC_DEFINE(HAVE_SHL_LOAD_API, 1, 1781 AC_DEFINE(HAVE_SHL_LOAD_API, 1,
1784 [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.]) 1782 [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.])
1785 ;; 1783 ;;
1786 LoadLibrary) 1784 LoadLibrary)
1787 loadlibrary_api=true 1785 loadlibrary_api=yes
1788 DL_API_MSG="(LoadLibrary)" 1786 DL_API_MSG="(LoadLibrary)"
1789 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, 1787 AC_DEFINE(HAVE_LOADLIBRARY_API, 1,
1790 [Define to 1 if your system has LoadLibrary for dynamic linking.]) 1788 [Define to 1 if your system has LoadLibrary for dynamic linking.])
1791 ;; 1789 ;;
1792 dyld) 1790 dyld)
1793 dyld_api=true 1791 dyld_api=yes
1794 DL_API_MSG="(dyld)" 1792 DL_API_MSG="(dyld)"
1795 AC_DEFINE(HAVE_DYLD_API, 1, 1793 AC_DEFINE(HAVE_DYLD_API, 1,
1796 [Define to 1 if your system has dyld for dynamic linking.]) 1794 [Define to 1 if your system has dyld for dynamic linking.])
1797 ;; 1795 ;;
1798 esac 1796 esac
1799 1797
1800 DL_LIBS="$lt_cv_dlopen_libs" 1798 DL_LIBS="$lt_cv_dlopen_libs"
1801 AC_SUBST(DL_LIBS) 1799 AC_SUBST(DL_LIBS)
1802 1800
1803 ## Disable dynamic linking if capability is not present. 1801 ## Disable dynamic linking if capability is not present.
1804 if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then 1802 if test $dlopen_api = yes \
1805 : # some form of dynamic linking present 1803 || test $shl_load_api = yes \
1804 || test $loadlibrary_api = yes \
1805 || test $dyld_api = yes; then
1806 # some form of dynamic linking present
1807 ENABLE_DYNAMIC_LINKING=yes
1806 else 1808 else
1807 ENABLE_DYNAMIC_LINKING=false 1809 ENABLE_DYNAMIC_LINKING=no
1808 fi 1810 fi
1809 fi 1811 fi
1810 1812
1811 if $ENABLE_DYNAMIC_LINKING; then 1813 if test $ENABLE_DYNAMIC_LINKING = yes; then
1812 AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.]) 1814 AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.])
1813 fi 1815 fi
1814 1816
1815 AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING], 1817 AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING],
1816 [test x"$ENABLE_DYNAMIC_LINKING" = x"true"]) 1818 [test $ENABLE_DYNAMIC_LINKING = yes])
1817 1819
1818 if $SHARED_LIBS; then 1820 if test $SHARED_LIBS = yes; then
1819 LIBOCTINTERP="-loctinterp$SHLLINKEXT" 1821 LIBOCTINTERP="-loctinterp$SHLLINKEXT"
1820 LIBOCTAVE="-loctave$SHLLINKEXT" 1822 LIBOCTAVE="-loctave$SHLLINKEXT"
1821 else 1823 else
1822 LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)' 1824 LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)'
1823 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)' 1825 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)'
2209 2211
2210 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" 2212 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual"
2211 2213
2212 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" 2214 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual"
2213 2215
2214 try_extra_warning_flags=true 2216 try_extra_warning_flags=yes
2215 2217
2216 AC_ARG_ENABLE([extra-warning-flags], 2218 AC_ARG_ENABLE([extra-warning-flags],
2217 [AS_HELP_STRING([--disable-extra-warning-flags], 2219 [AS_HELP_STRING([--disable-extra-warning-flags],
2218 [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])], 2220 [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])],
2219 [if test "$enableval" = no; then 2221 [if test "$enableval" = no; then
2220 try_extra_warning_flags=false 2222 try_extra_warning_flags=no
2221 fi], 2223 fi],
2222 []) 2224 [])
2223 2225
2224 if $try_extra_warning_flags; then 2226 if test $try_extra_warning_flags = yes; then
2225 for flag in $GCC_EXTRA_FLAGS; do 2227 for flag in $GCC_EXTRA_FLAGS; do
2226 OCTAVE_CC_FLAG([$flag], [ 2228 OCTAVE_CC_FLAG([$flag], [
2227 WARN_CFLAGS="$WARN_CFLAGS $flag"; 2229 WARN_CFLAGS="$WARN_CFLAGS $flag";
2228 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) 2230 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])])
2229 done 2231 done
2236 2238
2237 GCC_STRICT_FLAGS="-Wconversion" 2239 GCC_STRICT_FLAGS="-Wconversion"
2238 2240
2239 GXX_STRICT_FLAGS="-Wconversion -Weffc++" 2241 GXX_STRICT_FLAGS="-Wconversion -Weffc++"
2240 2242
2241 try_strict_warning_flags=false 2243 try_strict_warning_flags=no
2242 2244
2243 AC_ARG_ENABLE([strict-warning-flags], 2245 AC_ARG_ENABLE([strict-warning-flags],
2244 [AS_HELP_STRING([--enable-strict-warning-flags], 2246 [AS_HELP_STRING([--enable-strict-warning-flags],
2245 [add extra strict warning options to CFLAGS and CXXFLAGS])], 2247 [add extra strict warning options to CFLAGS and CXXFLAGS])],
2246 [if test "$enableval" = yes; then 2248 [if test "$enableval" = yes; then
2247 try_strict_warning_flags=true 2249 try_strict_warning_flags=yes
2248 fi], 2250 fi],
2249 []) 2251 [])
2250 2252
2251 if $try_strict_warning_flags; then 2253 if test $try_strict_warning_flags = yes; then
2252 for flag in $GCC_STRICT_FLAGS; do 2254 for flag in $GCC_STRICT_FLAGS; do
2253 OCTAVE_CC_FLAG([$flag], [ 2255 OCTAVE_CC_FLAG([$flag], [
2254 WARN_CFLAGS="$WARN_CFLAGS $flag"; 2256 WARN_CFLAGS="$WARN_CFLAGS $flag";
2255 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) 2257 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])])
2256 done 2258 done
2264 AC_SUBST(WARN_CFLAGS) 2266 AC_SUBST(WARN_CFLAGS)
2265 AC_SUBST(WARN_CXXFLAGS) 2267 AC_SUBST(WARN_CXXFLAGS)
2266 2268
2267 ### Check for Java. 2269 ### Check for Java.
2268 2270
2269 build_java=true 2271 build_java=yes
2270 AC_ARG_ENABLE([java], 2272 AC_ARG_ENABLE([java],
2271 [AS_HELP_STRING([--disable-java], 2273 [AS_HELP_STRING([--disable-java],
2272 [disable Java interface])], 2274 [disable Java interface])],
2273 [if test "$enableval" = no; then 2275 [if test "$enableval" = no; then
2274 build_java=false 2276 build_java=no
2275 fi], 2277 fi],
2276 []) 2278 [])
2277 2279
2278 AC_ARG_WITH([java-homedir], 2280 AC_ARG_WITH([java-homedir],
2279 [AS_HELP_STRING([--with-java-homedir=DIR], 2281 [AS_HELP_STRING([--with-java-homedir=DIR],
2300 JAVAC= 2302 JAVAC=
2301 JAR= 2303 JAR=
2302 JAVA_LIBS= 2304 JAVA_LIBS=
2303 2305
2304 ## Fake loop so that "break" can be used to skip code blocks. 2306 ## Fake loop so that "break" can be used to skip code blocks.
2305 while test $build_java = true 2307 while test $build_java = yes
2306 do 2308 do
2307 ## Unset build_java. Variable is set only if all configuration tests pass. 2309 ## Unset build_java. Variable is set only if all configuration tests pass.
2308 build_java=false 2310 build_java=no
2309 2311
2310 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. 2312 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME.
2311 if test -z "$JAVA_HOME"; then 2313 if test -z "$JAVA_HOME"; then
2312 AC_MSG_WARN([JAVA_HOME environment variable not initialized.]) 2314 AC_MSG_WARN([JAVA_HOME environment variable not initialized.])
2313 AC_MSG_WARN([Auto-detection will proceed but is unreliable.]) 2315 AC_MSG_WARN([Auto-detection will proceed but is unreliable.])
2382 ## At this point Win32/MSVC systems have enough configuration data. We 2384 ## At this point Win32/MSVC systems have enough configuration data. We
2383 ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have 2385 ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have
2384 ## the required paths to compile and link against JDK. 2386 ## the required paths to compile and link against JDK.
2385 case $host_os in 2387 case $host_os in
2386 msdosmsvc) 2388 msdosmsvc)
2387 build_java=true 2389 build_java=yes
2388 JAVA_LIBS=-ladvapi32 2390 JAVA_LIBS=-ladvapi32
2389 AC_DEFINE(HAVE_JAVA, 1, 2391 AC_DEFINE(HAVE_JAVA, 1,
2390 [Define to 1 if Java is available and is at least version 1.5]) 2392 [Define to 1 if Java is available and is at least version 1.5])
2391 break 2393 break
2392 ;; 2394 ;;
2393 mingw*) 2395 mingw*)
2394 if test $have_msvc = yes; then 2396 if test $have_msvc = yes; then
2395 build_java=true 2397 build_java=yes
2396 JAVA_LIBS=-ladvapi32 2398 JAVA_LIBS=-ladvapi32
2397 AC_DEFINE(HAVE_JAVA, 1, 2399 AC_DEFINE(HAVE_JAVA, 1,
2398 [Define to 1 if Java is available and is at least version 1.5]) 2400 [Define to 1 if Java is available and is at least version 1.5])
2399 break 2401 break
2400 fi 2402 fi
2507 ;; 2509 ;;
2508 esac 2510 esac
2509 2511
2510 ## Verify jni.h include file exists. 2512 ## Verify jni.h include file exists.
2511 JNI_PATH=`echo $JAVA_CPPFLAGS | sed -e 's/-I//g'` 2513 JNI_PATH=`echo $JAVA_CPPFLAGS | sed -e 's/-I//g'`
2512 have_jni=false 2514 have_jni=no
2513 for dir in $JNI_PATH; do 2515 for dir in $JNI_PATH; do
2514 if test -f "${dir}/jni.h"; then have_jni=true; break; fi 2516 if test -f "${dir}/jni.h"; then have_jni=yes; break; fi
2515 done 2517 done
2516 if test $have_jni = true; then 2518 if test $have_jni = yes; then
2517 AC_MSG_RESULT([$dir]) 2519 AC_MSG_RESULT([$dir])
2518 else 2520 else
2519 AC_MSG_RESULT([not found]) 2521 AC_MSG_RESULT([not found])
2520 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.]) 2522 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.])
2521 break 2523 break
2522 fi 2524 fi
2523 2525
2524 ## Passed all configuration tests. A workable Java installation was found. 2526 ## Passed all configuration tests. A workable Java installation was found.
2525 build_java=true 2527 build_java=yes
2526 AC_DEFINE(HAVE_JAVA, 1, 2528 AC_DEFINE(HAVE_JAVA, 1,
2527 [Define to 1 if Java is available and is at least version 1.5]) 2529 [Define to 1 if Java is available and is at least version 1.5])
2528 break 2530 break
2529 done 2531 done
2530 2532
2531 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = true]) 2533 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes])
2532 AC_SUBST(JAVA) 2534 AC_SUBST(JAVA)
2533 AC_SUBST(JAVAC) 2535 AC_SUBST(JAVAC)
2534 AC_SUBST(JAR) 2536 AC_SUBST(JAR)
2535 AC_SUBST(JAVA_CPPFLAGS) 2537 AC_SUBST(JAVA_CPPFLAGS)
2536 AC_SUBST(JAVA_LIBS) 2538 AC_SUBST(JAVA_LIBS)
2980 2982
2981 warn_msg_printed=false 2983 warn_msg_printed=false
2982 2984
2983 OCTAVE_CONFIGURE_WARNING_SUMMARY 2985 OCTAVE_CONFIGURE_WARNING_SUMMARY
2984 2986
2985 if $ENABLE_DYNAMIC_LINKING; then 2987 if test $ENABLE_DYNAMIC_LINKING = yes; then
2986 if test $SHARED_LIBS = false; then 2988 if test $SHARED_LIBS = no; then
2987 AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) 2989 AC_MSG_WARN([You used --enable-dl but not --enable-shared.])
2988 AC_MSG_WARN([Are you sure that is what you want to do?]) 2990 AC_MSG_WARN([Are you sure that is what you want to do?])
2989 warn_msg_printed=true 2991 warn_msg_printed=true
2990 fi 2992 fi
2991 fi 2993 fi
2992 2994
2993 if $USE_64_BIT_IDX_T; then 2995 if test $USE_64_BIT_IDX_T = yes; then
2994 AC_MSG_WARN([]) 2996 AC_MSG_WARN([])
2995 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) 2997 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.])
2996 AC_MSG_WARN([Are you sure that is what you want to do?]) 2998 AC_MSG_WARN([Are you sure that is what you want to do?])
2997 AC_MSG_WARN([]) 2999 AC_MSG_WARN([])
2998 AC_MSG_WARN([Your Fortran compiler must have an option to generate]) 3000 AC_MSG_WARN([Your Fortran compiler must have an option to generate])
3005 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) 3007 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.])
3006 AC_MSG_WARN([]) 3008 AC_MSG_WARN([])
3007 warn_msg_printed=true 3009 warn_msg_printed=true
3008 fi 3010 fi
3009 3011
3010 if $USE_OPENMP; then 3012 if test $USE_OPENMP = yes; then
3011 AC_MSG_WARN([]) 3013 AC_MSG_WARN([])
3012 AC_MSG_WARN([You used the EXPERIMENTAL --enable-openmp option.]) 3014 AC_MSG_WARN([You used the EXPERIMENTAL --enable-openmp option.])
3013 AC_MSG_WARN([Are you sure that is what you want to do?]) 3015 AC_MSG_WARN([Are you sure that is what you want to do?])
3014 AC_MSG_WARN([]) 3016 AC_MSG_WARN([])
3015 AC_MSG_WARN([This option enables experimental SMP multithreding]) 3017 AC_MSG_WARN([This option enables experimental SMP multithreding])
3018 AC_MSG_WARN([this option enabled will be correct.]) 3020 AC_MSG_WARN([this option enabled will be correct.])
3019 AC_MSG_WARN([]) 3021 AC_MSG_WARN([])
3020 warn_msg_printed=true 3022 warn_msg_printed=true
3021 fi 3023 fi
3022 3024
3023 if test $native_graphics = false; then 3025 if test $native_graphics != yes; then
3024 AC_MSG_WARN([]) 3026 AC_MSG_WARN([])
3025 AC_MSG_WARN([I didn't find the necessary libraries to compile native]) 3027 AC_MSG_WARN([I didn't find the necessary libraries to compile native])
3026 AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) 3028 AC_MSG_WARN([graphics. It isn't necessary to have native graphics,])
3027 AC_MSG_WARN([but you will need to have gnuplot installed or you won't]) 3029 AC_MSG_WARN([but you will need to have gnuplot installed or you won't])
3028 AC_MSG_WARN([be able to use any of Octave's plotting commands]) 3030 AC_MSG_WARN([be able to use any of Octave's plotting commands])
3029 AC_MSG_WARN([]) 3031 AC_MSG_WARN([])
3030 warn_msg_printed=true 3032 warn_msg_printed=true
3031 fi 3033 fi
3032 3034
3033 if test -n "$warn_gnuplot"; then 3035 if test -n "$warn_gnuplot"; then
3034 if $native_graphics; then 3036 if test $native_graphics = yes; then
3035 AC_MSG_WARN([]) 3037 AC_MSG_WARN([])
3036 AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) 3038 AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the])
3037 AC_MSG_WARN([native graphics toolkit.]) 3039 AC_MSG_WARN([native graphics toolkit.])
3038 else 3040 else
3039 AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) 3041 AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot])
3053 AC_MSG_WARN([]) 3055 AC_MSG_WARN([])
3054 3056
3055 warn_msg_printed=true 3057 warn_msg_printed=true
3056 fi 3058 fi
3057 3059
3058 if $USE_ATOMIC_REFCOUNT; then 3060 if test $USE_ATOMIC_REFCOUNT = yes; then
3059 AC_MSG_WARN([]) 3061 AC_MSG_WARN([])
3060 AC_MSG_WARN([Using atomic reference counting.]) 3062 AC_MSG_WARN([Using atomic reference counting.])
3061 AC_MSG_WARN([This feature allows access to Octave data safely from]) 3063 AC_MSG_WARN([This feature allows access to Octave data safely from])
3062 AC_MSG_WARN([another thread, for instance from a GUI. However this]) 3064 AC_MSG_WARN([another thread, for instance from a GUI. However this])
3063 AC_MSG_WARN([results in a small performance penalty in the Octave]) 3065 AC_MSG_WARN([results in a small performance penalty in the Octave])
3064 AC_MSG_WARN([interpreter.]) 3066 AC_MSG_WARN([interpreter.])
3065 AC_MSG_WARN([]) 3067 AC_MSG_WARN([])
3066 if $USE_OCTAVE_ALLOCATOR; then 3068 if test $USE_OCTAVE_ALLOCATOR = yes; then
3067 AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also]) 3069 AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also])
3068 AC_MSG_WARN([disable the use of the octave_allocator class.]) 3070 AC_MSG_WARN([disable the use of the octave_allocator class.])
3069 AC_MSG_WARN([]) 3071 AC_MSG_WARN([])
3070 fi 3072 fi
3071 warn_msg_printed=true 3073 warn_msg_printed=true