Mercurial > octave-nkf
changeset 9514:af86991d8d47
configure tweaks
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 11 Aug 2009 16:06:01 -0400 |
| parents | 9f870f73ab7d |
| children | eee9b3150446 |
| files | ChangeLog Makeconf.in configure.in src/ChangeLog src/Makefile.in src/oct-conf.h.in src/toplev.cc |
| diffstat | 7 files changed, 143 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 11 09:08:12 2009 +0200 +++ b/ChangeLog Tue Aug 11 16:06:01 2009 -0400 @@ -1,3 +1,15 @@ +2009-08-11 John W. Eaton <jwe@octave.org> + + * configure.in: Generate separate variables for HDF5_LIBS and + ZLIB_LIBS. Don't add them to LIBS. Add separate entries for them + in the summary report. + * Makeconf.in (HDF5_LIBS, ZLIB_LIBS): New variables. + (do-subst-config-vals): Substitute AMD_LIBS, ARPACK_LIBS, + CAMD_LIBS, CCOLAMD_LIBS, CHOLMOD_LIBS, COLAMD_LIBS, CXSPARSE_LIBS, + FT2_LIBS, GRAPHICS_LIBS, HDF5_LIBS, OPENGL_LIBS, PTHREAD_CFLAGS, + PTHREAD_LIBS, QHULL_LIBS, QRUPDATE_LIBS, REGEX_LIBS, UMFPACK_LIBS, + ZLIB_LIBS. + 2009-08-05 John W. Eaton <jwe@octave.org> * acx_pthread.m4: New file.
--- a/Makeconf.in Tue Aug 11 09:08:12 2009 +0200 +++ b/Makeconf.in Tue Aug 11 16:06:01 2009 -0400 @@ -230,6 +230,8 @@ TERMLIBS = @TERMLIBS@ FT2_LIBS = @FT2_LIBS@ +HDF5_LIBS = @HDF5_LIBS@ +ZLIB_LIBS = @ZLIB_LIBS@ GRAPHICS_LIBS = @GRAPHICS_LIBS@ QHULL_LIBS = @QHULL_LIBS@ REGEX_LIBS = @REGEX_LIBS@ @@ -476,17 +478,24 @@ -e "s|%OCTAVE_CONF_ALL_CXXFLAGS%|\"${ALL_CXXFLAGS}\"|" \ -e "s|%OCTAVE_CONF_ALL_FFLAGS%|\"${ALL_FFLAGS}\"|" \ -e "s|%OCTAVE_CONF_ALL_LDFLAGS%|\"${ALL_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_AMD_LIBS%|\"${AMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_AR%|\"${AR}\"|" \ -e "s|%OCTAVE_CONF_ARFLAGS%|\"${ARFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_ARPACK_LIBS%|\"${ARPACK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_BLAS_LIBS%|\"${BLAS_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_CAMD_LIBS%|\"${CAMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ -e "s|%OCTAVE_CONF_CARBON_LIBS%|\"${CARBON_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CC%|\"${CC}\"|" \ -e "s|%OCTAVE_CONF_CC_VERSION%|\"${CC_VERSION}\"|" \ + -e "s|%OCTAVE_CONF_CCOLAMD_LIBS%|\"${CCOLAMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CFLAGS%|\"${CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_CHOLMOD_LIBS%|\"${CHOLMOD_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_COLAMD_LIBS%|\"${COLAMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CPICFLAG%|\"${CPICFLAG}\"|" \ -e "s|%OCTAVE_CONF_CPPFLAGS%|\"${CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_CURL_LIBS%|\"${CURL_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_CXSPARSE_LIBS%|\"${CXSPARSE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CXX%|\"${CXX}\"|" \ -e "s|%OCTAVE_CONF_CXXCPP%|\"${CXXCPP}\"|" \ -e "s|%OCTAVE_CONF_CXXFLAGS%|\"${CXXFLAGS}\"|" \ @@ -505,8 +514,11 @@ -e "s|%OCTAVE_CONF_FFTW_LIBS%|\"${FFTW_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \ + -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \ + -e "s|%OCTAVE_CONF_GRAPHICS_LIBS%|\"${GRAPHICS_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ -e "s|%OCTAVE_CONF_INCFLAGS%|\"${INCFLAGS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \ @@ -530,9 +542,15 @@ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \ + -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \ + -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_QHULL_LIBS%|\"${QHULL_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ + -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \ -e "s|%OCTAVE_CONF_RLD_FLAG%|\"${RLD_FLAG}\"|" \ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ @@ -544,6 +562,7 @@ -e "s|%OCTAVE_CONF_SONAME_FLAGS%|\"${SONAME_FLAGS}\"|" \ -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \ -e "s|%OCTAVE_CONF_UGLY_DEFS%|\"${UGLY_DEFS}\"|" \ + -e "s|%OCTAVE_CONF_UMFPACK_LIBS%|\"${UMFPACK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \ -e "s|%OCTAVE_CONF_VERSION%|\"${version}\"|" \ -e "s|%OCTAVE_CONF_ENABLE_DYNAMIC_LINKING%|\"${ENABLE_DYNAMIC_LINKING}\"|" \ @@ -553,6 +572,7 @@ -e "s|%OCTAVE_CONF_XTRA_CXXFLAGS%|\"${XTRA_CXXFLAGS}\"|" \ -e "s|%OCTAVE_CONF_YACC%|\"${YACC}\"|" \ -e "s|%OCTAVE_CONF_YFLAGS%|\"${YFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_ZLIB_LIBS%|\"${ZLIB_LIBS}\"|" \ -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" | \ $(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > $@-t $(simple-move-if-change-rule)
--- a/configure.in Tue Aug 11 09:08:12 2009 +0200 +++ b/configure.in Tue Aug 11 16:06:01 2009 -0400 @@ -523,12 +523,12 @@ WITH_ZLIB=false if test -n "$zlib_lib"; then AC_CHECK_LIB($zlib_lib, gzclearerr, [ - AC_CHECK_HEADERS(zlib.h, [ - WITH_ZLIB=true - ZLIB_LIBS="-l$zlib_lib" - LIBS="$ZLIB_LIBS $LIBS" - AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available.])])]) + AC_CHECK_HEADERS(zlib.h, [ + WITH_ZLIB=true + ZLIB_LIBS="-l$zlib_lib" + AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available.])])]) fi +AC_SUBST(ZLIB_LIBS) if $WITH_ZLIB; then ### Check for HDF5 library. @@ -552,13 +552,15 @@ AC_CHECK_HEADERS(hdf5.h, [ WITH_HDF5=true HDF5_LIBS="-l$hdf5_lib" - LIBS="$HDF5_LIBS $LIBS" + save_LIBS="$LIBS" + LIBS="$HDF5_LIBS $ZLIB_LIBS $LIBS" AC_CHECK_LIB($hdf5_lib, H5Gget_num_objs, [ OCTAVE_HDF5_HAS_REQUIRED_API if test $WITH_HDF5; then AC_DEFINE(HAVE_HDF5, 1, [Define if HDF5 is available.]) AC_DEFINE(HAVE_H5GGET_NUM_OBJS, 1, [Define if HDF5 has H5Gget_num_objs.]) - fi])])]) + fi]) + LIBS="$save_LIBS"])]) fi if $WITH_HDF5; then @@ -567,13 +569,12 @@ OCTAVE_HDF5_DLL ;; esac - true fi else warn_zlib="ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files." AC_MSG_WARN($warn_zlib) fi - +AC_SUBST(HDF5_LIBS) # Checks for FFTW header and library. @@ -2220,6 +2221,7 @@ ARPACK libraries: $ARPACK_LIBS QRUPDATE libraries: $QRUPDATE_LIBS HDF5 libraries: $HDF5_LIBS + ZLIB libraries: $ZLIB_LIBS CURL libraries: $CURL_LIBS REGEX libraries: $REGEX_LIBS QHULL libraries: $QHULL_LIBS
--- a/src/ChangeLog Tue Aug 11 09:08:12 2009 +0200 +++ b/src/ChangeLog Tue Aug 11 16:06:01 2009 -0400 @@ -1,3 +1,12 @@ +2009-08-11 John W. Eaton <jwe@octave.org> + + * oct-conf.h.in: New #defines for AMD_LIBS, ARPACK_LIBS, + CAMD_LIBS, CCOLAMD_LIBS, CHOLMOD_LIBS, COLAMD_LIBS, CXSPARSE_LIBS, + FT2_LIBS, GRAPHICS_LIBS, HDF5_LIBS, OPENGL_LIBS, PTHREAD_CFLAGS, + PTHREAD_LIBS, QHULL_LIBS, QRUPDATE_LIBS, REGEX_LIBS, UMFPACK_LIBS, + ZLIB_LIBS. + * toplev.cc (octave_config_info): Include them in the struct. + 2009-08-11 Jaroslav Hajek <highegg@gmail.com> * data.cc (Fdiff): New built-in function.
--- a/src/Makefile.in Tue Aug 11 09:08:12 2009 +0200 +++ b/src/Makefile.in Tue Aug 11 16:06:01 2009 -0400 @@ -294,7 +294,7 @@ endif OCTINTERP_LINK_DEPS = $(RLD_FLAG) -L../liboctave $(LIBOCTAVE) \ - $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) + $(HDF5_LIBS) $(ZLIB_LIBS) $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP)
--- a/src/oct-conf.h.in Tue Aug 11 09:08:12 2009 +0200 +++ b/src/oct-conf.h.in Tue Aug 11 16:06:01 2009 -0400 @@ -41,6 +41,10 @@ #define OCTAVE_CONF_ALL_LDFLAGS %OCTAVE_CONF_ALL_LDFLAGS% #endif +#ifndef OCTAVE_CONF_AMD_LIBS +#define OCTAVE_CONF_AMD_LIBS %OCTAVE_CONF_AMD_LIBS% +#endif + #ifndef OCTAVE_CONF_ARFLAGS #define OCTAVE_CONF_ARFLAGS %OCTAVE_CONF_ARFLAGS% #endif @@ -49,10 +53,18 @@ #define OCTAVE_CONF_AR %OCTAVE_CONF_AR% #endif +#ifndef OCTAVE_CONF_ARPACK_LIBS +#define OCTAVE_CONF_ARPACK_LIBS %OCTAVE_CONF_ARPACK_LIBS% +#endif + #ifndef OCTAVE_CONF_BLAS_LIBS #define OCTAVE_CONF_BLAS_LIBS %OCTAVE_CONF_BLAS_LIBS% #endif +#ifndef OCTAVE_CONF_CAMD_LIBS +#define OCTAVE_CONF_CAMD_LIBS %OCTAVE_CONF_CAMD_LIBS% +#endif + #ifndef OCTAVE_CONF_CARBON_LIBS #define OCTAVE_CONF_CARBON_LIBS %OCTAVE_CONF_CARBON_LIBS% #endif @@ -65,10 +77,22 @@ #define OCTAVE_CONF_CC_VERSION %OCTAVE_CONF_CC_VERSION% #endif +#ifndef OCTAVE_CONF_CCOLAMD_LIBS +#define OCTAVE_CONF_CCOLAMD_LIBS %OCTAVE_CONF_CCOLAMD_LIBS% +#endif + #ifndef OCTAVE_CONF_CFLAGS #define OCTAVE_CONF_CFLAGS %OCTAVE_CONF_CFLAGS% #endif +#ifndef OCTAVE_CONF_CHOLMOD_LIBS +#define OCTAVE_CONF_CHOLMOD_LIBS %OCTAVE_CONF_CHOLMOD_LIBS% +#endif + +#ifndef OCTAVE_CONF_COLAMD_LIBS +#define OCTAVE_CONF_COLAMD_LIBS %OCTAVE_CONF_COLAMD_LIBS% +#endif + #ifndef OCTAVE_CONF_CPICFLAG #define OCTAVE_CONF_CPICFLAG %OCTAVE_CONF_CPICFLAG% #endif @@ -81,6 +105,10 @@ #define OCTAVE_CONF_CURL_LIBS %OCTAVE_CONF_CURL_LIBS% #endif +#ifndef OCTAVE_CONF_CXSPARSE_LIBS +#define OCTAVE_CONF_CXSPARSE_LIBS %OCTAVE_CONF_CXSPARSE_LIBS% +#endif + #ifndef OCTAVE_CONF_CXXCPP #define OCTAVE_CONF_CXXCPP %OCTAVE_CONF_CXXCPP% #endif @@ -149,6 +177,10 @@ #define OCTAVE_CONF_FPICFLAG %OCTAVE_CONF_FPICFLAG% #endif +#ifndef OCTAVE_CONF_FT2_LIBS +#define OCTAVE_CONF_FT2_LIBS %OCTAVE_CONF_FT2_LIBS% +#endif + #ifndef OCTAVE_CONF_GLPK_LIBS #define OCTAVE_CONF_GLPK_LIBS %OCTAVE_CONF_GLPK_LIBS% #endif @@ -157,6 +189,14 @@ #define OCTAVE_CONF_GNUPLOT %OCTAVE_CONF_GNUPLOT% #endif +#ifndef OCTAVE_CONF_GRAPHICS_LIBS +#define OCTAVE_CONF_GRAPHICS_LIBS %OCTAVE_CONF_GRAPHICS_LIBS% +#endif + +#ifndef OCTAVE_CONF_HDF5_LIBS +#define OCTAVE_CONF_HDF5_LIBS %OCTAVE_CONF_HDF5_LIBS% +#endif + #ifndef OCTAVE_CONF_INCFLAGS #define OCTAVE_CONF_INCFLAGS %OCTAVE_CONF_INCFLAGS% #endif @@ -245,10 +285,30 @@ #define OCTAVE_CONF_OCTLIBDIR %OCTAVE_CONF_OCTLIBDIR% #endif +#ifndef OCTAVE_CONF_OPENGL_LIBS +#define OCTAVE_CONF_OPENGL_LIBS %OCTAVE_CONF_OPENGL_LIBS% +#endif + #ifndef OCTAVE_CONF_PREFIX #define OCTAVE_CONF_PREFIX %OCTAVE_CONF_PREFIX% #endif +#ifndef OCTAVE_CONF_PTHREAD_CFLAGS +#define OCTAVE_CONF_PTHREAD_CFLAGS %OCTAVE_CONF_PTHREAD_CFLAGS% +#endif + +#ifndef OCTAVE_CONF_PTHREAD_LIBS +#define OCTAVE_CONF_PTHREAD_LIBS %OCTAVE_CONF_PTHREAD_LIBS% +#endif + +#ifndef OCTAVE_CONF_QHULL_LIBS +#define OCTAVE_CONF_QHULL_LIBS %OCTAVE_CONF_QHULL_LIBS% +#endif + +#ifndef OCTAVE_CONF_QRUPDATE_LIBS +#define OCTAVE_CONF_QRUPDATE_LIBS %OCTAVE_CONF_QRUPDATE_LIBS% +#endif + #ifndef OCTAVE_CONF_RANLIB #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB% #endif @@ -257,6 +317,10 @@ #define OCTAVE_CONF_RDYNAMIC_FLAG %OCTAVE_CONF_RDYNAMIC_FLAG% #endif +#ifndef OCTAVE_CONF_REGEX_LIBS +#define OCTAVE_CONF_REGEX_LIBS %OCTAVE_CONF_REGEX_LIBS% +#endif + #ifndef OCTAVE_CONF_RLD_FLAG #define OCTAVE_CONF_RLD_FLAG %OCTAVE_CONF_RLD_FLAG% #endif @@ -297,6 +361,10 @@ #define OCTAVE_CONF_UGLY_DEFS %OCTAVE_CONF_UGLY_DEFS% #endif +#ifndef OCTAVE_CONF_UMFPACK_LIBS +#define OCTAVE_CONF_UMFPACK_LIBS %OCTAVE_CONF_UMFPACK_LIBS% +#endif + #ifndef OCTAVE_CONF_USE_64_BIT_IDX_T #define OCTAVE_CONF_USE_64_BIT_IDX_T %OCTAVE_CONF_USE_64_BIT_IDX_T% #endif @@ -329,6 +397,10 @@ #define OCTAVE_CONF_YFLAGS %OCTAVE_CONF_YFLAGS% #endif +#ifndef OCTAVE_CONF_ZLIB_LIBS +#define OCTAVE_CONF_ZLIB_LIBS %OCTAVE_CONF_ZLIB_LIBS% +#endif + #ifndef OCTAVE_CONF_config_opts #define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts% #endif
--- a/src/toplev.cc Tue Aug 11 09:08:12 2009 +0200 +++ b/src/toplev.cc Tue Aug 11 16:06:01 2009 -0400 @@ -1195,16 +1195,23 @@ { false, "ALL_CXXFLAGS", OCTAVE_CONF_ALL_CXXFLAGS }, { false, "ALL_FFLAGS", OCTAVE_CONF_ALL_FFLAGS }, { false, "ALL_LDFLAGS", OCTAVE_CONF_ALL_LDFLAGS }, + { false, "AMD_LIBS", OCTAVE_CONF_AMD_LIBS }, { false, "AR", OCTAVE_CONF_AR }, { false, "ARFLAGS", OCTAVE_CONF_ARFLAGS }, + { false, "ARPACK_LIBS", OCTAVE_CONF_ARPACK_LIBS }, { false, "BLAS_LIBS", OCTAVE_CONF_BLAS_LIBS }, { false, "CARBON_LIBS", OCTAVE_CONF_CARBON_LIBS }, + { false, "CAMD_LIBS", OCTAVE_CONF_CAMD_LIBS }, { false, "CC", OCTAVE_CONF_CC }, { false, "CC_VERSION", OCTAVE_CONF_CC_VERSION }, + { false, "CCOLAMD_LIBS", OCTAVE_CONF_CCOLAMD_LIBS }, { false, "CFLAGS", OCTAVE_CONF_CFLAGS }, + { false, "CHOLMOD_LIBS", OCTAVE_CONF_CHOLMOD_LIBS }, + { false, "COLAMD_LIBS", OCTAVE_CONF_COLAMD_LIBS }, { false, "CPICFLAG", OCTAVE_CONF_CPICFLAG }, { false, "CPPFLAGS", OCTAVE_CONF_CPPFLAGS }, { false, "CURL_LIBS", OCTAVE_CONF_CURL_LIBS }, + { false, "CXSPARSE_LIBS", OCTAVE_CONF_CXSPARSE_LIBS }, { false, "CXX", OCTAVE_CONF_CXX }, { false, "CXXCPP", OCTAVE_CONF_CXXCPP }, { false, "CXXFLAGS", OCTAVE_CONF_CXXFLAGS }, @@ -1223,8 +1230,11 @@ { false, "FFTW_LIBS", OCTAVE_CONF_FFTW_LIBS }, { false, "FLIBS", OCTAVE_CONF_FLIBS }, { false, "FPICFLAG", OCTAVE_CONF_FPICFLAG }, + { false, "FT2_LIBS", OCTAVE_CONF_FT2_LIBS }, { false, "GLPK_LIBS", OCTAVE_CONF_GLPK_LIBS }, { false, "GNUPLOT", OCTAVE_CONF_GNUPLOT }, + { false, "GRAPHICS_LIBS", OCTAVE_CONF_GRAPHICS_LIBS }, + { false, "HDF5_LIBS", OCTAVE_CONF_HDF5_LIBS }, { false, "INCFLAGS", OCTAVE_CONF_INCFLAGS }, { false, "LDFLAGS", OCTAVE_CONF_LDFLAGS }, { false, "LD_CXX", OCTAVE_CONF_LD_CXX }, @@ -1243,8 +1253,14 @@ { false, "MAGICK_INCFLAGS", OCTAVE_CONF_MAGICK_INCFLAGS }, { false, "MAGICK_LIBS", OCTAVE_CONF_MAGICK_LIBS }, { false, "MKOCTFILE_DL_LDFLAGS", OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS }, + { false, "OPENGL_LIBS", OCTAVE_CONF_OPENGL_LIBS }, + { false, "PTHREAD_CFLAGS", OCTAVE_CONF_PTHREAD_CFLAGS }, + { false, "PTHREAD_LIBS", OCTAVE_CONF_PTHREAD_LIBS }, + { false, "QHULL_LIBS", OCTAVE_CONF_QHULL_LIBS }, + { false, "QRUPDATE_LIBS", OCTAVE_CONF_QRUPDATE_LIBS }, { false, "RANLIB", OCTAVE_CONF_RANLIB }, { false, "RDYNAMIC_FLAG", OCTAVE_CONF_RDYNAMIC_FLAG }, + { false, "REGEX_LIBS", OCTAVE_CONF_REGEX_LIBS }, { false, "RLD_FLAG", OCTAVE_CONF_RLD_FLAG }, { false, "SED", OCTAVE_CONF_SED }, { false, "SHARED_LIBS", OCTAVE_CONF_SHARED_LIBS }, @@ -1255,6 +1271,7 @@ { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS }, { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS }, { false, "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS }, + { false, "UMFPACK_LIBS", OCTAVE_CONF_UMFPACK_LIBS }, { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T }, { false, "X11_INCFLAGS", OCTAVE_CONF_X11_INCFLAGS }, { false, "X11_LIBS", OCTAVE_CONF_X11_LIBS }, @@ -1262,6 +1279,7 @@ { false, "XTRA_CXXFLAGS", OCTAVE_CONF_XTRA_CXXFLAGS }, { false, "YACC", OCTAVE_CONF_YACC }, { false, "YFLAGS", OCTAVE_CONF_YFLAGS }, + { false, "ZLIB_LIBS", OCTAVE_CONF_ZLIB_LIBS }, { false, "api_version", OCTAVE_API_VERSION }, { true, "archlibdir", OCTAVE_ARCHLIBDIR }, { true, "bindir", OCTAVE_BINDIR },