[Emacs-diffs] trunk r114180: Convert ChangeLog text to in-file comment

[Glenn Morris]

------------------------------------------------------------
revno: 114180
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-09 08:54:03 -0700
message:
  Convert ChangeLog text to in-file comment
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-09-09 07:34:15 +0000
+++ b/ChangeLog 2013-09-09 15:54:03 +0000
@@ -3,11 +3,6 @@
        * configure.ac (LDFLAGS_NOCOMBRELOC): New variable.
        (LDFLAGS): Move nocombreloc option from here...
        (LD_SWITCH_SYSTEM_TEMACS): ... to here.
-       This is an essential option that should not be in LDFLAGS,
-       because the user may override that at build time; eg
-       http://bugs.debian.org/684788.  temacs is the only thing
-       that actually needs this option; this is where it was orginally:
-       
http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
 
 2013-09-08  Glenn Morris  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2013-09-09 07:34:15 +0000
+++ b/configure.ac      2013-09-09 15:54:03 +0000
@@ -1026,7 +1026,16 @@
 dnl Treat GCC specially since it just gives a non-fatal `unrecognized option'
 dnl if not built to support GNU ld.
 
-late_LDFLAGS=$LDFLAGS
+dnl For a long time, this was added to LDFLAGS rather than
+dnl LD_SWITCH_SYSTEM_TEMACS.  That is: i) inappropriate, since
+dnl LDFLAGS is supposed to be a user option, and this flag is
+dnl essential.  It can leads to problems if the user overrides
+dnl LDFLAGS at _build_ time (make LDFLAGS=... all), eg
+dnl http://bugs.debian.org/684788.
+dnl ii) unnecessary, since temacs is the only thing
+dnl that actually needs this option - this is where it was orginally:
+dnl http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
+late_LDFLAGS="$LDFLAGS"
 if test x$GCC = xyes; then
   LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
 else
@@ -1041,7 +1050,7 @@
   LDFLAGS_NOCOMBRELOC=
   [AC_MSG_RESULT(no)])
 
-LDFLAGS=$late_LDFLAGS
+LDFLAGS="$late_LDFLAGS"
 
 dnl The function dump-emacs will not be defined and temacs will do
 dnl (load "loadup") automatically unless told otherwise.