[Emacs-diffs] /srv/bzr/emacs/trunk r107859: Repurpose C_SWITCH_X_SYSTEM as GNUSTEP_CFLAGS

[Glenn Morris]

------------------------------------------------------------
revno: 107859
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 21:25:51 -0400
message:
  Repurpose C_SWITCH_X_SYSTEM as GNUSTEP_CFLAGS
  This is the only thing left that uses it.
  
  * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.
  
  * src/Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.
  
  * lwlib/Makefile.in (C_SWITCH_X_SYSTEM): Remove.
  (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
  
  * oldXMenu/Makefile.in (C_SWITCH_X_SYSTEM): Remove.
  (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
  
  * msdos/sedlibmk.inp, msdos/sed1v2.inp:
  GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM.
modified:
  ChangeLog
  configure.in
  lwlib/ChangeLog
  lwlib/Makefile.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sedlibmk.inp
  oldXMenu/ChangeLog
  oldXMenu/Makefile.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-10 07:18:02 +0000
+++ b/ChangeLog 2012-04-11 01:25:51 +0000
@@ -1,3 +1,7 @@
+2012-04-11  Glenn Morris  <address@hidden>
+
+       * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.
+
 2012-04-10  Glenn Morris  <address@hidden>
 
        * configure.in: Conditionally generate admin/unidata/Makefile.

=== modified file 'configure.in'
--- a/configure.in      2012-04-10 07:18:02 +0000
+++ b/configure.in      2012-04-11 01:25:51 +0000
@@ -2589,7 +2589,7 @@
 dnl Check for malloc/malloc.h on darwin
 AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define 
to 1 if you have the <malloc/malloc.h> header file.])])
 
-C_SWITCH_X_SYSTEM=
+GNUSTEP_CFLAGS=
 ### Use NeXTstep API to implement GUI.
 if test "${HAVE_NS}" = "yes"; then
   AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either 
GNUstep or Cocoa on Mac OS X.])
@@ -2600,9 +2600,7 @@
     AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing 
under GNUstep.])
     # See also .m.o rule in Makefile.in */
     # FIXME: are all these flags really needed?  Document here why.  */
-    dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only
-    dnl used in src/Makefile.in.
-    C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing 
-I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+    GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing 
-I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import 
-fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 
-DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
@@ -3222,7 +3220,7 @@
 ## end of LIBX_BASE, but nothing ever set it.
 AC_SUBST(LD_SWITCH_X_SITE)
 AC_SUBST(C_SWITCH_X_SITE)
-AC_SUBST(C_SWITCH_X_SYSTEM)
+AC_SUBST(GNUSTEP_CFLAGS)
 AC_SUBST(CFLAGS)
 ## Used in lwlib/Makefile.in.
 AC_SUBST(X_TOOLKIT_TYPE)

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2012-02-09 07:48:22 +0000
+++ b/lwlib/ChangeLog   2012-04-11 01:25:51 +0000
@@ -1,3 +1,8 @@
+2012-04-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (C_SWITCH_X_SYSTEM): Remove.
+       (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
+
 2011-10-13  Dmitry Antipov  <address@hidden>
 
        * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with
@@ -1756,7 +1761,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2012-01-19 07:21:25 +0000
+++ b/lwlib/Makefile.in 2012-04-11 01:25:51 +0000
@@ -1,5 +1,5 @@
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2012  Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
@@ -26,7 +26,6 @@
 address@hidden@
 @SET_MAKE@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
@@ -53,7 +52,7 @@
 ## $(srcdir) is where the lwlib sources are.
 ## There are no generated lwlib files, hence no need for -I.
 ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
-  $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \
+  $(C_SWITCH_MACHINE) \
   $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \
   -DHAVE_CONFIG_H -Demacs -I../src \
   -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-04-07 20:00:16 +0000
+++ b/msdos/ChangeLog   2012-04-11 01:25:51 +0000
@@ -1,3 +1,7 @@
+2012-04-11  Glenn Morris  <address@hidden>
+
+       * sedlibmk.inp, sed1v2.inp: GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM.
+
 2012-04-07  Glenn Morris  <address@hidden>
 
        * sed2v2.inp: Bump version to 24.1.50.
@@ -1312,7 +1316,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1994-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2012-01-19 07:21:25 +0000
+++ b/msdos/sed1v2.inp  2012-04-11 01:25:51 +0000
@@ -2,7 +2,7 @@
 # Configuration script for src/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996-1997, 1999-2012  Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -39,7 +39,7 @@
 /^LIBOBJS *=/s/@address@hidden@//
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
-/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
+/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
@@ -186,7 +186,7 @@
 /^      *THEFILE=/s|$|\; cd ../src|
 /^     echo.* buildobj.h/s|echo |djecho |
 # Make the GCC command line fit one screen line
-/^[    ][      ]*\$(C_SWITCH_X_SYSTEM)/d
+/^[    ][      ]*\$(GNUSTEP_CFLAGS)/d
 /^[    ][      ]*\$(GCONF_CFLAGS)/d
 /^[    ][      ]*\$(LIBGNUTLS_CFLAGS)/d
 s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) //

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2012-01-05 09:46:05 +0000
+++ b/msdos/sedlibmk.inp        2012-04-11 01:25:51 +0000
@@ -2,7 +2,7 @@
 # Configuration script for lib/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2011-2012  Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -124,7 +124,7 @@
 /^CYGWIN_OBJ *=/s/@address@hidden@//
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
-/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
+/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^DEFS *=/s/@address@hidden@/-DHAVE_CONFIG_H/

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2012-02-09 07:48:22 +0000
+++ b/oldXMenu/ChangeLog        2012-04-11 01:25:51 +0000
@@ -1,3 +1,8 @@
+2012-04-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (C_SWITCH_X_SYSTEM): Remove.
+       (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
+
 2011-04-16  Paul Eggert  <address@hidden>
 
        Static checks with GCC 4.6.0 and non-default toolkits.
@@ -615,7 +620,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

=== modified file 'oldXMenu/Makefile.in'
--- a/oldXMenu/Makefile.in      2012-01-19 07:21:25 +0000
+++ b/oldXMenu/Makefile.in      2012-04-11 01:25:51 +0000
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001-2012  Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -45,7 +45,6 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
@@ -88,7 +87,7 @@
 all:: libXMenu11.a
 
 ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
-  $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \
+  $(C_SWITCH_X_SITE) \
   ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \
   $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
   -I../src -I${srcdir} -I${srcdir}/../src

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-11 00:51:44 +0000
+++ b/src/ChangeLog     2012-04-11 01:25:51 +0000
@@ -1,3 +1,7 @@
+2012-04-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.
+
 2012-04-11  Stefan Monnier  <address@hidden>
 
        * alloc.c (lisp_align_malloc): Remove unneeded prototype.
@@ -9738,7 +9742,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2012  Free Software Foundation, Inc.
+  Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-04-09 20:37:08 +0000
+++ b/src/Makefile.in   2012-04-11 01:25:51 +0000
@@ -75,16 +75,13 @@
 ## System-specific CFLAGS.
 address@hidden@
 
-## Currently only set if NS_IMPL_GNUSTEP.
-## C_SWITCH_X_SITE may override this.
address@hidden@
address@hidden@
 
 ## Define C_SWITCH_X_SITE to contain any special flags your compiler
 ## may need to deal with X Windows.  For instance, if you've defined
 ## HAVE_X_WINDOWS and your X include files aren't in a place that your
 ## compiler can find on its own, you might want to add "-I/..." or
 ## something similar.  This is normally set by configure.
-## This is used before C_SWITCH_X_SYSTEM and may override it.
 address@hidden@
 
 ## Define LD_SWITCH_X_SITE to contain any special flags your loader
@@ -302,14 +299,11 @@
 ## -DHAVE_CONFIG_H is needed for some other files to take advantage of
 ## the information in `config.h'.
 ##
-## C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM
-## since it may have -I options that should override those.
-##
 ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG.
 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \
   -I$(lib) -I$(srcdir)/../lib \
   $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
-  $(C_SWITCH_X_SYSTEM) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
+  $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
   $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \