procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove LD_SWITCH_SYSTEM_EXTRA.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2010-05-24 20:46:15 -07:00
parent 6169260ba9
commit e545800352
6 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-05-25 Glenn Morris <rgm@gnu.org>
* 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 <romain@orebokech.com>
* make-dist: Look for version in src/emacs.c.

31
configure.in
View file

@ -3284,6 +3284,20 @@ case "$opsys" in
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 @@ esac
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

4
msdos/ChangeLog
View file

@ -1,3 +1,7 @@
2010-05-25 Glenn Morris <rgm@gnu.org>
* sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
2010-05-21 Glenn Morris <rgm@gnu.org>
* sed1v2.inp(@ns_frag@): Edit to nothing.

1
msdos/sed1v2.inp
View file

@ -51,7 +51,6 @@ s/\.h\.in/.h-in/
/^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/

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-25 Glenn Morris <rgm@gnu.org>
* Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
2010-05-25 Kenichi Handa <handa@m17n.org>
* dispextern.h (struct composition_it): New members rule_idx and

3
src/Makefile.in
View file

@ -110,10 +110,9 @@ LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@
## System-specific LDFLAGS.
LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@
LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@
## 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@