comparison libinterp/interpfcn/toplev.cc @ 16171:cf6788da4152

eliminate UGLY_DEFS * configure.ac: Don't generate and substitute UGLY_DEFS. * build-aux/common.mk (UGLY_DEFS): Delete. (octave_subst_config_vals): Substitute OCTAVE_CONF_DEFS with $DEFS, not $UGLY_DEFS. Delete duplicate OCTAVE_CONF_UGLY_DEFS substitutions. Revert previous change to save patterns in file. * oct-conf.in.h (OCTAVE_CONF_UGLY_DEFS): Delete. * toplev.cc (octave_config_info): Delete UGLY_DEFS from struct.
author John W. Eaton <jwe@octave.org>
date Sat, 02 Mar 2013 08:10:56 -0500
parents 2a4f83826024
children a7669b4d27f6
comparison
equal deleted inserted replaced
16170:2a4f83826024 16171:cf6788da4152
1372 { false, "SH_LD", OCTAVE_CONF_SH_LD }, 1372 { false, "SH_LD", OCTAVE_CONF_SH_LD },
1373 { false, "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS }, 1373 { false, "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS },
1374 { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS }, 1374 { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS },
1375 { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS }, 1375 { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS },
1376 { false, "TERM_LIBS", OCTAVE_CONF_TERM_LIBS }, 1376 { false, "TERM_LIBS", OCTAVE_CONF_TERM_LIBS },
1377 { false, "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS },
1378 { false, "UMFPACK_CPPFLAGS", OCTAVE_CONF_UMFPACK_CPPFLAGS }, 1377 { false, "UMFPACK_CPPFLAGS", OCTAVE_CONF_UMFPACK_CPPFLAGS },
1379 { false, "UMFPACK_LDFLAGS", OCTAVE_CONF_UMFPACK_LDFLAGS }, 1378 { false, "UMFPACK_LDFLAGS", OCTAVE_CONF_UMFPACK_LDFLAGS },
1380 { false, "UMFPACK_LIBS", OCTAVE_CONF_UMFPACK_LIBS }, 1379 { false, "UMFPACK_LIBS", OCTAVE_CONF_UMFPACK_LIBS },
1381 { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T }, 1380 { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T },
1382 { false, "WARN_CFLAGS", OCTAVE_CONF_WARN_CFLAGS }, 1381 { false, "WARN_CFLAGS", OCTAVE_CONF_WARN_CFLAGS },