Mercurial > emacs
comparison configure @ 108185:804e9ced8374
Rework previous autoconf changes, hopefully to make clearer.
* configure.in (OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
* configure: Regenerate.
* src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
for clarity.
(OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
(otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 30 Apr 2010 20:04:51 -0700 |
parents | e6f59a2ba110 |
children | f015ae3fb447 |
comparison
equal
deleted
inserted
replaced
108184:f4b0e5358091 | 108185:804e9ced8374 |
---|---|
800 WIDGET_OBJ | 800 WIDGET_OBJ |
801 TOOLKIT_LIBW | 801 TOOLKIT_LIBW |
802 OLDXMENU | 802 OLDXMENU |
803 LIBXMENU | 803 LIBXMENU |
804 CYGWIN_OBJ | 804 CYGWIN_OBJ |
805 OTHER_OBJ | 805 PRE_ALLOC_OBJ |
806 POST_ALLOC_OBJ | |
806 LTLIBOBJS' | 807 LTLIBOBJS' |
807 ac_subst_files='' | 808 ac_subst_files='' |
808 ac_user_opts=' | 809 ac_user_opts=' |
809 enable_option_checking | 810 enable_option_checking |
810 with_pop | 811 with_pop |
26164 _ACEOF | 26165 _ACEOF |
26165 | 26166 |
26166 fi | 26167 fi |
26167 | 26168 |
26168 | 26169 |
26169 OTHER_OBJ="\$(gmallocobj) \$(rallocobj)" | |
26170 if test "$opsys" = "cygwin"; then | 26170 if test "$opsys" = "cygwin"; then |
26171 CYGWIN_OBJ="sheap.o" | 26171 CYGWIN_OBJ="sheap.o" |
26172 ## Cygwin differs because of its unexec(). | 26172 ## Cygwin differs because of its unexec(). |
26173 OTHER_OBJ="$OTHER_OBJ lastfile.o vm-limit.o" | 26173 PRE_ALLOC_OBJ= |
26174 POST_ALLOC_OBJ="lastfile.o vm-limit.o" | |
26174 else | 26175 else |
26175 CYGWIN_OBJ= | 26176 CYGWIN_OBJ= |
26176 OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)" | 26177 PRE_ALLOC_OBJ=lastfile.o |
26177 fi | 26178 POST_ALLOC_OBJ="\$(vmlimitobj)" |
26179 fi | |
26180 | |
26178 | 26181 |
26179 | 26182 |
26180 | 26183 |
26181 | 26184 |
26182 | 26185 |