Mercurial > emacs
changeset 107736:1f5000fd5ff7
Remove all uses of LIBX11_SYSTEM.
* Makefile.in (LIBX11_SYSTEM): Remove.
* s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
instead.
* configure.in: Remove all references to LIBX11_SYSTEM.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 01 Apr 2010 16:08:14 -0700 |
| parents | 6a5be93fe0dd |
| children | 912a8c0c9a8a |
| files | ChangeLog admin/CPP-DEFINES configure configure.in src/ChangeLog src/Makefile.in src/s/msdos.h |
| diffstat | 7 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 01 18:29:04 2010 +0300 +++ b/ChangeLog Thu Apr 01 16:08:14 2010 -0700 @@ -1,3 +1,7 @@ +2010-04-01 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in: Remove all references to LIBX11_SYSTEM. + 2010-03-30 Dan Nicolaescu <dann@ics.uci.edu> * configure.in: Remove all references to C_DEBUG_SWITCH.
--- a/admin/CPP-DEFINES Thu Apr 01 18:29:04 2010 +0300 +++ b/admin/CPP-DEFINES Thu Apr 01 16:08:14 2010 -0700 @@ -234,7 +234,6 @@ LIBS_MACHINE LIBS_SYSTEM LIBS_TERMCAP -LIBX11_SYSTEM LIBXMU LIB_GCC LIB_MATH
--- a/configure Thu Apr 01 18:29:04 2010 +0300 +++ b/configure Thu Apr 01 16:08:14 2010 -0700 @@ -5796,10 +5796,7 @@ #define LIB_X11_LIB -lX11 #endif -#ifndef LIBX11_SYSTEM -#define LIBX11_SYSTEM -#endif -configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM +configure___ LIBX=LIB_X11_LIB #ifdef UNEXEC configure___ unexec=UNEXEC
--- a/configure.in Thu Apr 01 18:29:04 2010 +0300 +++ b/configure.in Thu Apr 01 16:08:14 2010 -0700 @@ -865,10 +865,7 @@ #define LIB_X11_LIB -lX11 #endif -#ifndef LIBX11_SYSTEM -#define LIBX11_SYSTEM -#endif -configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM +configure___ LIBX=LIB_X11_LIB #ifdef UNEXEC configure___ unexec=UNEXEC
--- a/src/ChangeLog Thu Apr 01 18:29:04 2010 +0300 +++ b/src/ChangeLog Thu Apr 01 16:08:14 2010 -0700 @@ -1,24 +1,31 @@ +2010-04-01 Dan Nicolaescu <dann@ics.uci.edu> + + Remove all uses of LIBX11_SYSTEM. + * Makefile.in (LIBX11_SYSTEM): Remove. + * s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM + instead. + 2010-04-01 Eli Zaretskii <eliz@gnu.org> Remove support for DJGPP v1.x (bug#5813). * w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility. - * s/msdos.h: - * unexec.c (make_hdr, copy_text_and_data): - * sysdep.c (wait_for_termination, sys_subshell): + * s/msdos.h: + * unexec.c (make_hdr, copy_text_and_data): + * sysdep.c (wait_for_termination, sys_subshell): * msdos.c (dos_set_window_size, msdos_set_cursor_shape) - (IT_set_terminal_modes): + (IT_set_terminal_modes): (__write, _rename, gethostname, gettimeofday, alarm, fork, kill) (dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP v1.x code and tests of the value of __DJGPP__. (nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x compatibility code. - * lread.c: - * gmalloc.c (memalign): - * fileio.c (Fcopy_file, check_executable, Ffile_modes): - * emacs.c (main): - * dosfns.c (init_dosfns): + * lread.c: + * gmalloc.c (memalign): + * fileio.c (Fcopy_file, check_executable, Ffile_modes): + * emacs.c (main): + * dosfns.c (init_dosfns): * dired.c (file_name_completion_stat): Remove tests of __DJGPP__. * xdisp.c (set_cursor_from_row): Fix cursor positioning when the
--- a/src/Makefile.in Thu Apr 01 18:29:04 2010 +0300 +++ b/src/Makefile.in Thu Apr 01 16:08:14 2010 -0700 @@ -284,10 +284,6 @@ #endif $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< -#ifndef LIBX11_SYSTEM -#define LIBX11_SYSTEM -#endif - #ifndef LIB_X11_LIB #define LIB_X11_LIB -lX11 #endif @@ -376,7 +372,7 @@ /* LD_SWITCH_X_DEFAULT comes after everything else that specifies options for where to find X libraries, but before those libraries. */ X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT -LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS) +LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS) #else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE #endif /* not HAVE_X11 */
--- a/src/s/msdos.h Thu Apr 01 18:29:04 2010 +0300 +++ b/src/s/msdos.h Thu Apr 01 16:08:14 2010 -0700 @@ -149,7 +149,7 @@ commentary below, in the non-X branch. The 140KB number was measured on GNU/Linux and on MS-WIndows. */ #define SYSTEM_PURESIZE_EXTRA (-170000+140000) -#define LIBX11_SYSTEM -lxext -lsys +#define LIBS_SYSTEM -lxext -lsys #else /* We need a little extra space, see ../../lisp/loadup.el. As of 20091024, DOS-specific files use up 62KB of pure space. But