comparison configure.in @ 108769:a8af6d66bbd0

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.
author Glenn Morris <rgm@gnu.org>
date Mon, 24 May 2010 20:46:15 -0700
parents e6ab17110c0d
children 87142531365c
comparison
equal deleted inserted replaced
108768:56c66753dd38 108769:a8af6d66bbd0
3282 else 3282 else
3283 libs_nsgui= 3283 libs_nsgui=
3284 headerpad_extra=690 3284 headerpad_extra=690
3285 fi 3285 fi
3286 LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra" 3286 LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
3287
3288 ## This is here because src/Makefile.in did some extra fiddling around
3289 ## with LD_SWITCH_SYSTEM. The cpp logic was:
3290 ## #ifndef LD_SWITCH_SYSTEM
3291 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
3292 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
3293 ## not using gcc, darwin system not on an alpha (ie darwin, since
3294 ## darwin + alpha does not occur).
3295 ## Because this was done in src/Makefile.in, the resulting part of
3296 ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
3297 ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
3298 ## rather than LD_SWITCH_SYSTEM.
3299 test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
3300 LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
3287 ;; 3301 ;;
3288 3302
3289 *) LD_SWITCH_SYSTEM_TEMACS= ;; 3303 *) LD_SWITCH_SYSTEM_TEMACS= ;;
3290 esac 3304 esac
3291 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) 3305 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
3292
3293
3294 ## This exists because src/Makefile.in did some extra fiddling around
3295 ## with LD_SWITCH_SYSTEM. The cpp logic was:
3296 ## #ifndef LD_SWITCH_SYSTEM
3297 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
3298 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
3299 ## not using gcc, darwin system not on an alpha (ie darwin, since
3300 ## darwin + alpha does not occur).
3301 ## Note that unlike L_S_S, this is not used in ac_link.
3302 if test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
3303 test "$opsys" = "darwin"; then
3304 LD_SWITCH_SYSTEM_EXTRA="-X"
3305 else
3306 LD_SWITCH_SYSTEM_EXTRA=
3307 fi
3308 AC_SUBST(LD_SWITCH_SYSTEM_EXTRA)
3309 3306
3310 3307
3311 LINKER= 3308 LINKER=
3312 ORDINARY_LINK= 3309 ORDINARY_LINK=
3313 case "$opsys" in 3310 case "$opsys" in