diff build-aux/common.mk @ 21140:e06e600f396a

eliminate use of USE_64_BIT_IDX_T * common.mk (do_subst_config_vals, do_subst_cross_config_vals): Don't substitute OCTAVE_CONF_USE_64_BIT_IDX_T. * toplev.cc (octave_config_info): Set USE_64_BIT_IDX_T from OCTAVE_CONF_ENABLE_64. * oct-conf.in.h (OCTAVE_CONF_USE_64_BIT_IDX_T): Delete macro. * oct-hdf5.h, amd.cc, ccolamd.cc, colamd.cc, dmperm.cc, symbfact.cc, ov.cc, CSparse.cc, CSparse.h, MArray-i.cc, dSparse.cc, dSparse.h, SparseCmplxQR.h, SparseQR.h, sparse-base-chol.cc, lo-array-errwarn.cc, lo-array-gripes.cc, oct-sparse.h, acinclude.m4, oct-conf-post.in.h, computer.m: Use ENABLE_64 instead of USE_64_BIT_IDX_T.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Jan 2016 19:16:31 -0500
parents 54527108599a
children a83e7a384ee0
line wrap: on
line diff
--- a/build-aux/common.mk	Sun Jan 24 13:50:04 2016 -0500
+++ b/build-aux/common.mk	Mon Jan 25 19:16:31 2016 -0500
@@ -316,7 +316,6 @@
 
 # Miscellaneous
 
-USE_64_BIT_IDX_T = @USE_64_BIT_IDX_T@
 OCTAVE_IDX_TYPE = @OCTAVE_IDX_TYPE@
 
 if AMCOND_ADDRESS_SANITIZER_ENABLED
@@ -666,7 +665,6 @@
     -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \
     -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_WARN_CFLAGS%|\"${WARN_CFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_WARN_CXXFLAGS%|\"${WARN_CXXFLAGS}\"|" \
@@ -841,7 +839,6 @@
     -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \
     -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_WARN_CFLAGS%|\"${WARN_CFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_WARN_CXXFLAGS%|\"${WARN_CXXFLAGS}\"|" \