]>
Commit | Line | Data |
---|---|---|
cd27668b | 1 | diff -bruN openssh-2.1.0/Makefile.in openssh-2.1.0.new/Makefile.in |
2 | --- openssh-2.1.0/Makefile.in Tue May 9 06:28:55 2000 | |
3 | +++ openssh-2.1.0.new/Makefile.in Wed May 10 19:16:45 2000 | |
dfa53551 | 4 | @@ -23,6 +23,7 @@ |
74f9eee5 | 5 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" |
dfa53551 | 6 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ |
dfa53551 JR |
7 | LIBS=@LIBS@ |
8 | +LIBWRAP=@LIBWRAP@ | |
9 | AR=@AR@ | |
10 | RANLIB=@RANLIB@ | |
11 | INSTALL=@INSTALL@ | |
cd27668b | 12 | @@ -71,7 +72,7 @@ |
13 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
dfa53551 | 14 | |
cd27668b | 15 | sshd: libssh.a libopenbsd-compat.a $(SSHDOBJS) |
16 | - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
17 | + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP) | |
dfa53551 | 18 | |
cd27668b | 19 | scp: libopenbsd-compat.a libssh.a scp.o |
20 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
21 | diff -bruN openssh-2.1.0/configure.in openssh-2.1.0.new/configure.in | |
22 | --- openssh-2.1.0/configure.in Mon May 8 12:49:37 2000 | |
a6a9fb7b | 23 | +++ openssh-2.1.0.new/configure.in Wed May 10 20:29:00 2000 |
82b22518 | 24 | @@ -757,7 +757,10 @@ |
cd27668b | 25 | [ |
26 | if test "x$withval" != "xno" ; then | |
27 | saved_LIBS="$LIBS" | |
28 | - LIBS="$LIBS -lwrap" | |
29 | + LIBWRAP="-lwrap" | |
a6a9fb7b | 30 | + AC_SUBST(LIBWRAP) |
1019f162 | 31 | + AC_DEFINE(LIBWRAP) |
cd27668b | 32 | + LIBS="$saved_LIBS" |
33 | AC_MSG_CHECKING(for libwrap) | |
34 | AC_TRY_LINK( | |
6b669923 | 35 | [ |