[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100430: Remove LD_SWITCH_SYSTEM_EXTR
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100430: Remove LD_SWITCH_SYSTEM_EXTRA. |
Date: |
Mon, 24 May 2010 20:46:15 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100430
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-24 20:46:15 -0700
message:
Remove LD_SWITCH_SYSTEM_EXTRA.
* configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
here instead.
* src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
* msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
modified:
ChangeLog
configure.in
msdos/ChangeLog
msdos/sed1v2.inp
src/ChangeLog
src/Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-24 11:35:41 +0000
+++ b/ChangeLog 2010-05-25 03:46:15 +0000
@@ -1,3 +1,9 @@
+2010-05-25 Glenn Morris <address@hidden>
+
+ * configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
+ (LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
+ here instead.
+
2010-05-24 Romain Francoise <address@hidden>
* make-dist: Look for version in src/emacs.c.
=== modified file 'configure.in'
--- a/configure.in 2010-05-21 16:31:45 +0000
+++ b/configure.in 2010-05-25 03:46:15 +0000
@@ -3284,6 +3284,20 @@
headerpad_extra=690
fi
LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker
$headerpad_extra"
+
+ ## This is here because src/Makefile.in did some extra fiddling around
+ ## with LD_SWITCH_SYSTEM. The cpp logic was:
+ ## #ifndef LD_SWITCH_SYSTEM
+ ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
+ ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
+ ## not using gcc, darwin system not on an alpha (ie darwin, since
+ ## darwin + alpha does not occur).
+ ## Because this was done in src/Makefile.in, the resulting part of
+ ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
+ ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
+ ## rather than LD_SWITCH_SYSTEM.
+ test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
+ LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
;;
*) LD_SWITCH_SYSTEM_TEMACS= ;;
@@ -3291,23 +3305,6 @@
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
-## This exists because src/Makefile.in did some extra fiddling around
-## with LD_SWITCH_SYSTEM. The cpp logic was:
-## #ifndef LD_SWITCH_SYSTEM
-## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
-## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
-## not using gcc, darwin system not on an alpha (ie darwin, since
-## darwin + alpha does not occur).
-## Note that unlike L_S_S, this is not used in ac_link.
-if test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
- test "$opsys" = "darwin"; then
- LD_SWITCH_SYSTEM_EXTRA="-X"
-else
- LD_SWITCH_SYSTEM_EXTRA=
-fi
-AC_SUBST(LD_SWITCH_SYSTEM_EXTRA)
-
-
LINKER=
ORDINARY_LINK=
case "$opsys" in
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2010-05-21 00:48:14 +0000
+++ b/msdos/ChangeLog 2010-05-25 03:46:15 +0000
@@ -1,3 +1,7 @@
+2010-05-25 Glenn Morris <address@hidden>
+
+ * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
+
2010-05-21 Glenn Morris <address@hidden>
* sed1v2.inp(@ns_frag@): Edit to nothing.
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2010-05-21 00:48:14 +0000
+++ b/msdos/sed1v2.inp 2010-05-25 03:46:15 +0000
@@ -51,7 +51,6 @@
/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
-/^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@//
/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
/^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-25 01:03:44 +0000
+++ b/src/ChangeLog 2010-05-25 03:46:15 +0000
@@ -1,3 +1,8 @@
+2010-05-25 Glenn Morris <address@hidden>
+
+ * Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
+ (TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
+
2010-05-25 Kenichi Handa <address@hidden>
* dispextern.h (struct composition_it): New members rule_idx and
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-05-21 16:31:45 +0000
+++ b/src/Makefile.in 2010-05-25 03:46:15 +0000
@@ -110,10 +110,9 @@
## System-specific LDFLAGS.
address@hidden@
address@hidden@
## Flags to pass to ld only for temacs.
-TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA)
$(LD_SWITCH_SYSTEM_TEMACS)
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100430: Remove LD_SWITCH_SYSTEM_EXTRA.,
Glenn Morris <=