diff options
| author | Damien Miller <djm@mindrot.org> | 2000-03-16 10:48:25 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-03-16 10:48:25 +1100 |
| commit | 166bd448c92574b5fed88d24e9ca0af1481fe680 (patch) | |
| tree | 937847826238c88a83ba698991bf75217433bd9b | |
| parent | 08c788a9b3cc9eb211c65c4b33868beb81a9cfd1 (diff) | |
- Propogate LD through to Makefile
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | configure.in | 15 |
3 files changed, 19 insertions, 10 deletions
@@ -1,6 +1,7 @@ 20000316 - Fixed configure not passing LDFLAGS to Solaris. Report from David G. Hesprich <dghespri@sprintparanet.com> + - Propogate LD through to Makefile 20000315 - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list diff --git a/Makefile.in b/Makefile.in index a55af98d..f517144d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,7 @@ ASKPASS_LOCATION=@libexecdir@/ssh ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass CC=@CC@ +LD=@LD@ PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ LIBS=@LIBS@ @@ -55,22 +56,22 @@ libssh.a: $(LIBOBJS) $(RANLIB) $@ ssh: libssh.a $(SSHOBJS) - $(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) sshd: libssh.a $(SSHDOBJS) - $(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) scp: libssh.a scp.o - $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) ssh-add: libssh.a ssh-add.o log-client.o - $(CC) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) ssh-agent: libssh.a ssh-agent.o log-client.o - $(CC) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) ssh-keygen: libssh.a ssh-keygen.o log-client.o - $(CC) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) + $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) $(MANPAGES) $(CONFIGFILES):: $(FIXPATHSCMD) $(srcdir)/$@ diff --git a/configure.in b/configure.in index 27317bea..81265f1e 100644 --- a/configure.in +++ b/configure.in @@ -4,10 +4,6 @@ AC_CONFIG_HEADER(config.h) AC_PROG_CC AC_CANONICAL_HOST -# C Compiler features -if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi -AC_C_INLINE - # Checks for programs. AC_PROG_CPP AC_PROG_RANLIB @@ -16,6 +12,17 @@ AC_CHECK_PROG(AR, ar, ar) AC_PATH_PROG(PERL, perl) AC_SUBST(PERL) +if test -z "$LD" ; then + LD=$CC +fi +AC_SUBST(LD) + +# C Compiler features +AC_C_INLINE +if test "$GCC" = "yes"; then + CFLAGS="$CFLAGS -Wall" +fi + # Check for some target-specific stuff case "$host" in *-*-aix*) |