Mercurial > octave-nkf
comparison configure.ac @ 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 | 335041cc657a |
| children | b74c4e967f76 |
comparison
equal
deleted
inserted
replaced
| 16170:2a4f83826024 | 16171:cf6788da4152 |
|---|---|
| 2843 dnl ------------------------------------------------------------ | 2843 dnl ------------------------------------------------------------ |
| 2844 | 2844 |
| 2845 ### Make all AC_DEFINES available to testif feature of test.m function. | 2845 ### Make all AC_DEFINES available to testif feature of test.m function. |
| 2846 ### This must reside at the bottom of configure.ac after all AC_DEFINES | 2846 ### This must reside at the bottom of configure.ac after all AC_DEFINES |
| 2847 ### have been made. | 2847 ### have been made. |
| 2848 ### Use UGLY_DEFS to hold all the -D options. These are ultimately placed | |
| 2849 ### in the DEFS field of the struct returned by octave_config_info, which | |
| 2850 ### is used by test.m. | |
| 2851 | 2848 |
| 2852 AC_OUTPUT_MAKE_DEFS | 2849 AC_OUTPUT_MAKE_DEFS |
| 2853 | |
| 2854 ## We have to insert extra levels of backslash quoting here so that | |
| 2855 ## the right thing ends up in oct-conf.h. | |
| 2856 UGLY_DEFS=`echo $DEFS | $SED 's,\\",\\\\\\\\\\\\\\\\\\",g'` | |
| 2857 AC_MSG_NOTICE([defining UGLY_DEFS to be $UGLY_DEFS]) | |
| 2858 AC_SUBST(UGLY_DEFS) | |
| 2859 | 2850 |
| 2860 ### Do the substitutions in all the Makefiles. | 2851 ### Do the substitutions in all the Makefiles. |
| 2861 | 2852 |
| 2862 AC_SUBST(ac_config_files) | 2853 AC_SUBST(ac_config_files) |
| 2863 AC_SUBST(ac_config_headers) | 2854 AC_SUBST(ac_config_headers) |