Mercurial > octave

comparison configure.ac @ 31415:00e2eafd1c0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Use gnulib module to get readline libraries. * bootstrap.conf: Import readline module. * configure.ac: Remove separate checks for terminal library. Use readline linker flags as set by gnulib module. * m4/acinclude.m4 (OCTAVE_CHECK_LIB_TERMLIB): Remove function that is no longer needed. (OCTAVE_ENABLE_READLINE): Replace custom check by calling gnulib function. No longer check if version is at least 4.2. (It was released 20+ years ago.) * build-aux/subst-config-vals.in.h, build-aux/subst-cross-config-vals.in.h: Substitute READLINE_LIBS with result from gnulib function. Remove TERM_LIBS. * libinterp/build-env.h, libinterp/build-env.in.cc, libinterp/corefcn/toplev.cc: Remove TERM_LIBS. See also: https://octave.discourse.group/t/3559
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 10 Nov 2022 18:52:19 +0100
parents 97057039b835
children d1165473e4b0
comparison
equal deleted inserted replaced
31414:5341ff8d21d0 31415:00e2eafd1c0f
1458 1458
1459 ### Check for readline library. 1459 ### Check for readline library.
1460 1460
1461 OCTAVE_ENABLE_READLINE 1461 OCTAVE_ENABLE_READLINE
1462 1462
1463 ## Find a termlib to use.
1464 OCTAVE_CHECK_LIB_TERMLIB
1465
1466 ### Check for ZLIB library. 1463 ### Check for ZLIB library.
1467 1464
1468 OCTAVE_CHECK_LIB(z, ZLIB, 1465 OCTAVE_CHECK_LIB(z, ZLIB,
1469 [ZLIB library not found. Octave will not be able to load or save compressed data files or HDF5 files.], 1466 [ZLIB library not found. Octave will not be able to load or save compressed data files or HDF5 files.],
1470 [zlib.h], [gzclearerr]) 1467 [zlib.h], [gzclearerr])
2941 2938
2942 AC_SUBST(GNULIB_LINK_DEPS) 2939 AC_SUBST(GNULIB_LINK_DEPS)
2943 2940
2944 ### Set variables for link dependencies and options. 2941 ### Set variables for link dependencies and options.
2945 2942
2946 BASE_LIBOCTAVE_LINK_DEPS="$CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $READLINE_LIBS $TERM_LIBS $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS" 2943 BASE_LIBOCTAVE_LINK_DEPS="$CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $LTLIBREADLINE $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS"
2947 2944
2948 LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $GNULIB_LINK_DEPS" 2945 LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $GNULIB_LINK_DEPS"
2949 2946
2950 MKOCTFILE_LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $MKOCTFILE_GNULIB_LINK_DEPS" 2947 MKOCTFILE_LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $MKOCTFILE_GNULIB_LINK_DEPS"
2951 2948
3263 Qt uic: $UIC $UICFLAGS 3260 Qt uic: $UIC $UICFLAGS
3264 Qt rcc: $RCC $RCCFLAGS 3261 Qt rcc: $RCC $RCCFLAGS
3265 Qt lrelease: $LRELEASE $LRELEASEFLAGS 3262 Qt lrelease: $LRELEASE $LRELEASEFLAGS
3266 Qt qcollectiongenerator: $QCOLLECTIONGENERATOR $QCOLLECTIONGENERATORFLAGS 3263 Qt qcollectiongenerator: $QCOLLECTIONGENERATOR $QCOLLECTIONGENERATORFLAGS
3267 Qt qhelpgenerator: $QHELPGENERATOR $QHELPGENERATORFLAGS 3264 Qt qhelpgenerator: $QHELPGENERATOR $QHELPGENERATORFLAGS
3268 READLINE libraries: $READLINE_LIBS 3265 READLINE libraries: $LIBREADLINE
3269 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS 3266 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS
3270 Sndfile LDFLAGS: $SNDFILE_LDFLAGS 3267 Sndfile LDFLAGS: $SNDFILE_LDFLAGS
3271 Sndfile libraries: $SNDFILE_LIBS 3268 Sndfile libraries: $SNDFILE_LIBS
3272 SPQR CPPFLAGS: $SPQR_CPPFLAGS 3269 SPQR CPPFLAGS: $SPQR_CPPFLAGS
3273 SPQR LDFLAGS: $SPQR_LDFLAGS 3270 SPQR LDFLAGS: $SPQR_LDFLAGS
3280 SUNDIALS NVECTOR LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS 3277 SUNDIALS NVECTOR LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS
3281 SUNDIALS NVECTOR libraries: $SUNDIALS_NVECSERIAL_LIBS 3278 SUNDIALS NVECTOR libraries: $SUNDIALS_NVECSERIAL_LIBS
3282 SUNLINSOL KLU CPPFLAGS: $SUNDIALS_SUNLINSOLKLU_CPPFLAGS 3279 SUNLINSOL KLU CPPFLAGS: $SUNDIALS_SUNLINSOLKLU_CPPFLAGS
3283 SUNLINSOL KLU LDFLAGS: $SUNDIALS_SUNLINSOLKLU_LDFLAGS 3280 SUNLINSOL KLU LDFLAGS: $SUNDIALS_SUNLINSOLKLU_LDFLAGS
3284 SUNLINSOL KLU libraries: $SUNDIALS_SUNLINSOLKLU_LIBS 3281 SUNLINSOL KLU libraries: $SUNDIALS_SUNLINSOLKLU_LIBS
3285 TERM libraries: $TERM_LIBS
3286 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS 3282 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS
3287 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS 3283 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS
3288 UMFPACK libraries: $UMFPACK_LIBS 3284 UMFPACK libraries: $UMFPACK_LIBS
3289 X11 include flags: $X11_INCFLAGS 3285 X11 include flags: $X11_INCFLAGS
3290 X11 libraries: $X11_LIBS 3286 X11 libraries: $X11_LIBS