diff options
author | Glenn Morris <rgm@gnu.org> | 2010-05-25 23:41:58 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2010-05-25 23:41:58 -0700 |
commit | 90278cb61102b1bcf2c9a2837cb301af06a18127 (patch) | |
tree | 4ecd18fa52c2317a32ab158489880080853a2507 /configure | |
parent | 021eb8d750547099c7edcb537f46478276d7dc8c (diff) | |
download | emacs-90278cb61102b1bcf2c9a2837cb301af06a18127.tar.gz |
Replace YMF_PASS_LDFLAGS with autoconf.
* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure: Regenerate.
* src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
* msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/configure b/configure index 83b74eaafdf..7895df600a2 100755 --- a/configure +++ b/configure @@ -818,7 +818,8 @@ CYGWIN_OBJ PRE_ALLOC_OBJ POST_ALLOC_OBJ LD_SWITCH_SYSTEM_TEMACS -YMF_PASS_LDFLAGS +PRE_EDIT_LDFLAGS +POST_EDIT_LDFLAGS LINKER LIB_GCC MOUSE_SUPPORT @@ -26655,11 +26656,9 @@ case "$opsys" in ;; esac -## A macro which other sections of Makefile can redefine to munge the -## flags before they are passed to LD. This is helpful if you have -## redefined LD to something odd, like "gcc". -## (The YMF prefix is a holdover from the old name "ymakefile".) -YMF_PASS_LDFLAGS=flags + +PRE_EDIT_LDFLAGS= +POST_EDIT_LDFLAGS= if test "x$ORDINARY_LINK" = "xyes"; then LINKER="\$(CC)" @@ -26687,11 +26686,13 @@ elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then ## shell''s ``for'' construct. Note that sane people do not have '.' in ## their paths, so we must use ./prefix-args. ## TODO either make prefix-args check ORDINARY_LINK internally, - ## or remove it altogether (bug#6184), removing the need for this macro. - YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' + ## or remove it altogether (bug#6184), removing the need for this hack. + PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' + POST_EDIT_LDFLAGS='`' fi + test "x$LINKER" = "x" && LINKER=ld ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" |