diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-09 10:48:58 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-09 10:48:58 +1100 |
commit | d7f6615e781fcbb1a4873e688bc6143faac54fd5 (patch) | |
tree | efecf8696f25dcfe25bb999675f0f79a11e7c02a | |
parent | 6646badaa6e40c45efe52d9c2e8285f8c5301f5f (diff) | |
download | openssh-git-V_1_2PRE17.tar.gz |
- Applied patch from David Rankin <drankin@bohemians.lexington.ky.us>V_1_2PRE17
to fix libwrap support on NetBSD
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | configure.in | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -15,6 +15,8 @@ listen sock now. - [sshd.c] make that a fatal + - Applied patch from David Rankin <drankin@bohemians.lexington.ky.us> + to fix libwrap support on NetBSD - Released 1.2pre17 19991208 diff --git a/Makefile.in b/Makefile.in index 232f8e02..7148c50c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,6 +15,7 @@ CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ EXTRA_TARGETS=@GNOME_ASKPASS@ TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) LIBS=@LIBS@ +LIBWRAP=@LIBWRAP@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ @@ -48,7 +49,7 @@ ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o \ md5crypt.o libssh.a - $(CC) -o $@ $^ $(LFLAGS) $(LIBS) + $(CC) -o $@ $^ $(LFLAGS) $(LIBS) $(LIBWRAP) scp: scp.o libssh.a $(CC) -o $@ $^ $(LFLAGS) $(LIBS) diff --git a/configure.in b/configure.in index e0395528..2e7623bb 100644 --- a/configure.in +++ b/configure.in @@ -276,9 +276,10 @@ AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers Enable tcpwrappers support], [ AC_DEFINE(LIBWRAP) - LIBS="$LIBS -lwrap" + LIBWRAP="-lwrap" ] ) +AC_SUBST(LIBWRAP) dnl Check whether to enable MD5 passwords AC_ARG_WITH(md5-passwords, |