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.

2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ba513b1bcf2..83d2e956af6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (YMF_PASS_LDFLAGS): Remove.
+        (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
+
         * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
         Remove.
         (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
diff --git a/src/Makefile.in b/src/Makefile.in
index bbe573e69be..ea84fa08429 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -634,10 +634,14 @@ ${libsrc}make-docfile${EXEEXT}:
 buildobj.h: Makefile
         echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
 
+/* We cannot define variables for PRE_EDIT and POST_EDIT.
+   If !ORDINARY_LINK && !LINKER && GCC, they add a
+   \`./prefix-args -Xlinker ... \` wrapper, otherwise they are empty.
+   One alternative to this approach would be to always call prefix-args, 
+   and have it DTRT in all cases, by testing the above defines.  */
 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-        $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \
+        $(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \
           ${TEMACS_LDFLAGS2} \
           -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}