diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-16 16:01:56 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-16 16:01:56 -0700 |
| commit | b02a664581bd689ab006de403b1ef357a814f495 (patch) | |
| tree | 7105f25de296929dc545cf16adeb8b9dd9cf09b9 /configure | |
| parent | 8877ca0fdc090b6506a95272c0e6f1e16c3b0571 (diff) | |
| download | emacs-b02a664581bd689ab006de403b1ef357a814f495.tar.gz | |
Simplify temacs build rule.
* configure.in (TEMACS_LDFLAGS2): New output variable.
* configure: Regenerate.
* msdos/sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).
* src/Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
(temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure index eef5502c8ef..327ae22d2f0 100755 --- a/configure +++ b/configure @@ -719,6 +719,7 @@ LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX_RPATH NS_IMPL_GNUSTEP_INC NS_IMPL_GNUSTEP_TEMACS_LDFLAGS +TEMACS_LDFLAGS2 NS_OBJ NS_SUPPORT LIB_STANDARD @@ -9937,6 +9938,7 @@ tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" +TEMACS_LDFLAGS2="\${LDFLAGS}" if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes @@ -9967,6 +9969,7 @@ shared=no LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LIB_STANDARD= START_FILES= + TEMACS_LDFLAGS2= fi if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5 @@ -10156,6 +10159,7 @@ fi + NS_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then |