diff options
| author | Tom Tromey <tromey@redhat.com> | 2011-02-08 14:42:56 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2011-02-08 14:42:56 -0700 |
| commit | 00b3c7ac85c3811774305d8ccca6a17ec207b3f1 (patch) | |
| tree | 808628395db74d42f5755e5898d04b3d9b69e1b7 /configure | |
| parent | 6ca94a0b49f08f2e59aabc51545eb8a1f726ba8b (diff) | |
| download | emacs-00b3c7ac85c3811774305d8ccca6a17ec207b3f1.tar.gz | |
Make globals.h a generated header
* configure: Rebuild.
* configure.in (NS_OBJC_OBJ): New subst.
lib-src
* make-docfile.c: Unconditionally include stdlib.h.
(generate_globals): New global.
(xrealloc): New function.
(main): Handle '-g'. Call start_globals, write_globals.
(scan_file): Conditionally call put_filename.
(start_globals): New function.
(struct global): New.
(num_globals, globals): New globals.
(add_global, compare_globals, write_globals): New functions.
(scan_c_file): Update for "-g".
(scan_lisp_file): Fail if "-g".
(enum global_type): New.
src
* Makefile.in (NS_OBJC_OBJ): New variable.
(base_obj): Rename from 'obj'.
(obj): New variable.
(globals.h, gl-stamp, $(obj)): New targets.
(GLOBAL_SOURCES): New variable.
* globals.h: Remove.
* nsselect.m (Vselection_alist): Define. Reverts part of
2011-01-19T22:11:33Z!jan.h.d@swipnet.se.
* buffer.c: Don't use "no_cell" for name of kill-buffer-hook's
variable.
* xselect.c (Vselection_alist): Define. Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure index f2369751060..0cca2af9508 100755 --- a/configure +++ b/configure @@ -864,6 +864,7 @@ GMALLOC_OBJ HAVE_XSERVER LIB_STANDARD NS_SUPPORT +NS_OBJC_OBJ NS_OBJ TEMACS_LDFLAGS2 LD_SWITCH_X_SITE_AUX_RPATH @@ -1042,9 +1043,6 @@ LDFLAGS LIBS CPPFLAGS CPP -CPPFLAGS -CPP -CPPFLAGS XMKMF' @@ -8791,6 +8789,7 @@ fi ns_frag=/dev/null NS_OBJ= +NS_OBJC_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep @@ -8802,7 +8801,8 @@ if test "${HAVE_NS}" = yes; then prefix=${ns_appresdir} fi ns_frag=$srcdir/src/ns.mk - NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" + NS_OBJ="fontset.o fringe.o image.o" + NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" @@ -8812,6 +8812,7 @@ CPPFLAGS="$tmp_CPPFLAGS" + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes |