Mercurial > emacs
changeset 108558:58b814d12797
Move some undefs from src/Makefile.in to configure.
* configure.in (cpp_undefs): Add mktime, register, X11.
* src/Makefile.in (mktime, X11, register): Move undefs to configure.
* admin/CPP-DEFINES: Remove X11.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 13 May 2010 20:36:40 -0700 |
| parents | ca235e6a20eb |
| children | fa2c24863c9e 76b847a16569 |
| files | ChangeLog admin/CPP-DEFINES configure configure.in src/ChangeLog src/Makefile.in |
| diffstat | 6 files changed, 9 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 13 20:19:52 2010 -0700 +++ b/ChangeLog Thu May 13 20:36:40 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-14 Glenn Morris <rgm@gnu.org> + * configure.in (cpp_undefs): Add mktime, register, X11. + * configure.in (GPM_MOUSE_SUPPORT): Remove. (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables. (HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.
--- a/admin/CPP-DEFINES Thu May 13 20:19:52 2010 -0700 +++ b/admin/CPP-DEFINES Thu May 13 20:36:40 2010 -0700 @@ -22,7 +22,6 @@ NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. HAVE_X11 Compile support for the X11 GUI. HAVE_X_WINDOWS Compile support for X Window system -X11 ?? Makefile.in suggests it's equivalent to HAVE_X11 USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11. USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11. USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11.
--- a/configure Thu May 13 20:19:52 2010 -0700 +++ b/configure Thu May 13 20:36:40 2010 -0700 @@ -26722,7 +26722,7 @@ # the C preprocessor to some helpful value like 1, or maybe the empty # string. Needless to say consequent macro substitutions are less # than conducive to the makefile finding the correct directory. -cpp_undefs="`echo $srcdir $configuration $canonical unix | +cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"
--- a/configure.in Thu May 13 20:19:52 2010 -0700 +++ b/configure.in Thu May 13 20:36:40 2010 -0700 @@ -3622,7 +3622,10 @@ # the C preprocessor to some helpful value like 1, or maybe the empty # string. Needless to say consequent macro substitutions are less # than conducive to the makefile finding the correct directory. -[cpp_undefs="`echo $srcdir $configuration $canonical unix | +# src/Makefile.in used to treat X11 as equivalent to HAVE_X11. +# But nothing in Emacs defines X11, and everywhere else uses HAVE_X11, +# so that cannot have been doing anything. +[cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]
--- a/src/ChangeLog Thu May 13 20:19:52 2010 -0700 +++ b/src/ChangeLog Thu May 13 20:36:40 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-14 Glenn Morris <rgm@gnu.org> + * Makefile.in (mktime, X11, register): Move undefs to configure. + * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. (MSDOS_X_OBJ): New variable. (MSDOS_SUPPORT_REAL): New constant.
--- a/src/Makefile.in Thu May 13 20:19:52 2010 -0700 +++ b/src/Makefile.in Thu May 13 20:36:40 2010 -0700 @@ -251,23 +251,6 @@ DEPFLAGS = -MMD -MF deps/$*.d #endif -/* Do not let the file name mktime.c get messed up. */ -#ifdef mktime -#undef mktime -#endif - -/* Use HAVE_X11 as an alias for X11 in this file - to avoid problems with X11 as a subdirectory name - in -I and other such options which pass through this file. */ -#ifdef X11 -#define HAVE_X11 -#undef X11 -#endif - -/* On some machines #define register is done in config; - do not let it interfere with this file. */ -#undef register - /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */ @NS_IMPL_GNUSTEP_INC@