[Emacs-diffs] /srv/bzr/emacs/trunk r100273: Move some undefs from src/Makefile.in to configure.

[Glenn Morris]

------------------------------------------------------------
revno: 100273
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 20:36:40 -0700
message:
  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.
modified:
  ChangeLog
  admin/CPP-DEFINES
  configure
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-14 03:05:00 +0000
+++ b/ChangeLog 2010-05-14 03:36:40 +0000
@@ -1,5 +1,7 @@
 2010-05-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2010-05-14 03:19:52 +0000
+++ b/admin/CPP-DEFINES 2010-05-14 03:36:40 +0000
@@ -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.

=== modified file 'configure'
--- a/configure 2010-05-14 03:17:27 +0000
+++ b/configure 2010-05-14 03:36:40 +0000
@@ -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'`"
 

=== modified file 'configure.in'
--- a/configure.in      2010-05-14 03:05:00 +0000
+++ b/configure.in      2010-05-14 03:36:40 +0000
@@ -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'`"]
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-14 03:13:39 +0000
+++ b/src/ChangeLog     2010-05-14 03:36:40 +0000
@@ -1,5 +1,7 @@
 2010-05-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-14 03:13:39 +0000
+++ b/src/Makefile.in   2010-05-14 03:36:40 +0000
@@ -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@