[Emacs-diffs] /srv/bzr/emacs/trunk r100445: Remove some NS_IMPL_GNUSTEP build dead code.

[Glenn Morris]

------------------------------------------------------------
revno: 100445
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-25 20:42:07 -0700
message:
  Remove some NS_IMPL_GNUSTEP build dead code.
  
  * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
  (GNUSTEP_MAKEFILES): Remove.
  (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
  stuff to here.
  
  * src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
  Remove.
  (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
  
  * msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
  No longer present.
  
  Comments:
  See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
  Nothing from gui.make was used at all in src/Makefile.in.  The only
  thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
  set shared _after_ sourcing base.make, it was always empty.  We can
  move the remaining flags, set in configure, to the standard variable
  LD_SWITCH_SYSTEM_TEMACS.
modified:
  ChangeLog
  configure.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-25 03:53:12 +0000
+++ b/ChangeLog 2010-05-26 03:42:07 +0000
@@ -1,3 +1,10 @@
+2010-05-26  Glenn Morris  <address@hidden>
+
+       * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
+       (GNUSTEP_MAKEFILES): Remove.
+       (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
+       stuff to here.
+
 2010-05-25  Glenn Morris  <address@hidden>
 
        * configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...

=== modified file 'configure.in'
--- a/configure.in      2010-05-25 03:53:12 +0000
+++ b/configure.in      2010-05-26 03:42:07 +0000
@@ -1468,8 +1468,6 @@
 HAVE_NS=no
 NS_IMPL_COCOA=no
 NS_IMPL_GNUSTEP=no
-NS_IMPL_GNUSTEP_INC=
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
 tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
@@ -1491,20 +1489,9 @@
      ns_appbindir=${ns_appdir}
      ns_appresdir=${ns_appdir}Resources
      ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
-     dnl FIXME sourcing this 3 times in subshells seems inefficient.
-     GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
+     dnl FIXME sourcing this several times in subshells seems inefficient.
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo 
$GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo 
$GNUSTEP_SYSTEM_LIBRARIES)"
-     ## Pull in stuff from GNUstep-make.
-     ## FIXME? Cleaner to use AC_SUBST_FILE for this?
-     NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
-GUI_LIB=gnu
-include $GNUSTEP_MAKEFILES/Additional/base.make
-include $GNUSTEP_MAKEFILES/Additional/gui.make
-shared=no
-"
-     dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes.
-     NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} 
-lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
      CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
@@ -1525,8 +1512,6 @@
     NS_HAVE_NSINTEGER=no
   fi
 fi
-AC_SUBST(NS_IMPL_GNUSTEP_INC)
-AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
 AC_SUBST(TEMACS_LDFLAGS2)
 
 ns_frag=/dev/null
@@ -3311,6 +3296,11 @@
 
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
+
+if test "$NS_IMPL_GNUSTEP=yes"; then
+  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} 
-L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui 
-lgnustep-base -lobjc -lpthread"
+fi
+
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-25 03:46:15 +0000
+++ b/msdos/ChangeLog   2010-05-26 03:42:07 +0000
@@ -1,3 +1,8 @@
+2010-05-26  Glenn Morris  <address@hidden>
+
+       * sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+       No longer present.
+
 2010-05-25  Glenn Morris  <address@hidden>
 
        * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-25 03:46:15 +0000
+++ b/msdos/sed1v2.inp  2010-05-26 03:42:07 +0000
@@ -129,8 +129,6 @@
 /^M_FILE *=/address@hidden@address@hidden/intel386.h!
 /^S_FILE *=/address@hidden@address@hidden/msdos.h!
 /address@hidden@$/s/@SET_MAKE@//
-/address@hidden@/s/@NS_IMPL_GNUSTEP_INC@//
-/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@//
 /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
 /^.\${libsrc}make-doc/s!>.*$!!
 /^[   ]*$/d

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-26 01:14:51 +0000
+++ b/src/ChangeLog     2010-05-26 03:42:07 +0000
@@ -1,3 +1,9 @@
+2010-05-26  Glenn Morris  <address@hidden>
+
+       * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+       Remove.
+       (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+
 2010-05-26  Kenichi Handa  <address@hidden>
 
        * composite.c (composition_compute_stop_pos): Fix condition for

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-26 03:36:05 +0000
+++ b/src/Makefile.in   2010-05-26 03:42:07 +0000
@@ -111,14 +111,8 @@
 ## which are only good with temacs.
 address@hidden@
 
-## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
address@hidden@
-
-## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC.
address@hidden@
-
 ## Flags to pass to ld only for temacs.
-TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) 
$(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
 
 ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@