Commit fbc00890 authored by Glenn Morris's avatar Glenn Morris

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.
parent 97560d35
2010-05-14 Glenn Morris <rgm@gnu.org> 2010-05-14 Glenn Morris <rgm@gnu.org>
* configure.in (cpp_undefs): Add mktime, register, X11.
* configure.in (GPM_MOUSE_SUPPORT): Remove. * configure.in (GPM_MOUSE_SUPPORT): Remove.
(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables. (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables.
(HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM. (HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.
......
...@@ -22,7 +22,6 @@ NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. ...@@ -22,7 +22,6 @@ NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API.
NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
HAVE_X11 Compile support for the X11 GUI. HAVE_X11 Compile support for the X11 GUI.
HAVE_X_WINDOWS Compile support for X Window system 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_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11.
USE_MOTIF Use the Motif 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. USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11.
......
...@@ -26722,7 +26722,7 @@ test "${exec_prefix}" != NONE && ...@@ -26722,7 +26722,7 @@ test "${exec_prefix}" != NONE &&
# the C preprocessor to some helpful value like 1, or maybe the empty # the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less # string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory. # 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/ *$//' \ sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
-e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"
......
...@@ -3622,7 +3622,10 @@ test "${exec_prefix}" != NONE && ...@@ -3622,7 +3622,10 @@ test "${exec_prefix}" != NONE &&
# the C preprocessor to some helpful value like 1, or maybe the empty # the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less # string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory. # 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/ *$//' \ sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
-e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"] -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]
......
2010-05-14 Glenn Morris <rgm@gnu.org> 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. * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
(MSDOS_X_OBJ): New variable. (MSDOS_X_OBJ): New variable.
(MSDOS_SUPPORT_REAL): New constant. (MSDOS_SUPPORT_REAL): New constant.
......
...@@ -251,23 +251,6 @@ UNEXEC_OBJ = @unexec@ ...@@ -251,23 +251,6 @@ UNEXEC_OBJ = @unexec@
DEPFLAGS = -MMD -MF deps/$*.d DEPFLAGS = -MMD -MF deps/$*.d
#endif #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. */ /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */
@NS_IMPL_GNUSTEP_INC@ @NS_IMPL_GNUSTEP_INC@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment