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.

2 files changed, 2 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 164cfbf6edb..24ec0650d06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index 4d2481af924..3a0339a3f70 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -251,23 +251,6 @@ UNEXEC_OBJ = @unexec@
 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@