tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Propogate LD through to Makefile

This commit is contained in:
Damien Miller 2000-03-16 10:48:25 +11:00
parent 08c788a9b3
commit 166bd448c9
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
20000316 20000316
- Fixed configure not passing LDFLAGS to Solaris. Report from David G. - Fixed configure not passing LDFLAGS to Solaris. Report from David G.
Hesprich <dghespri@sprintparanet.com> Hesprich <dghespri@sprintparanet.com>
- Propogate LD through to Makefile
20000315 20000315
- Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list

13
Makefile.in
View File

@ -19,6 +19,7 @@ ASKPASS_LOCATION=@libexecdir@/ssh
ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass
CC=@CC@ CC=@CC@
LD=@LD@
PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
LIBS=@LIBS@ LIBS=@LIBS@
@ -55,22 +56,22 @@ libssh.a: $(LIBOBJS)
$(RANLIB) $@ $(RANLIB) $@
ssh: libssh.a $(SSHOBJS) ssh: libssh.a $(SSHOBJS)
$(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS)
sshd: libssh.a $(SSHDOBJS) sshd: libssh.a $(SSHDOBJS)
$(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS)
scp: libssh.a scp.o 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 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 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 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):: $(MANPAGES) $(CONFIGFILES)::
$(FIXPATHSCMD) $(srcdir)/$@ $(FIXPATHSCMD) $(srcdir)/$@

15
configure.in
View File

@ -4,10 +4,6 @@ AC_CONFIG_HEADER(config.h)
AC_PROG_CC AC_PROG_CC
AC_CANONICAL_HOST AC_CANONICAL_HOST
# C Compiler features
if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
AC_C_INLINE
# Checks for programs. # Checks for programs.
AC_PROG_CPP AC_PROG_CPP
AC_PROG_RANLIB AC_PROG_RANLIB
@ -16,6 +12,17 @@ AC_CHECK_PROG(AR, ar, ar)
AC_PATH_PROG(PERL, perl) AC_PATH_PROG(PERL, perl)
AC_SUBST(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 # Check for some target-specific stuff
case "$host" in case "$host" in
*-*-aix*) *-*-aix*)