]>
Commit | Line | Data |
---|---|---|
1d678e3c AM |
1 | diff -urN openssh-2.5.1p1.org/Makefile.in openssh-2.5.1p1/Makefile.in |
2 | --- openssh-2.5.1p1.org/Makefile.in Wed Feb 21 11:09:35 2001 | |
3 | +++ openssh-2.5.1p1/Makefile.in Wed Feb 21 11:10:45 2001 | |
4 | @@ -28,6 +28,7 @@ | |
5 | CFLAGS=@CFLAGS@ | |
6 | CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@ | |
dfa53551 JR |
7 | LIBS=@LIBS@ |
8 | +LIBWRAP=@LIBWRAP@ | |
9 | AR=@AR@ | |
10 | RANLIB=@RANLIB@ | |
11 | INSTALL=@INSTALL@ | |
1d678e3c | 12 | @@ -95,7 +96,7 @@ |
cd27668b | 13 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
dfa53551 | 14 | |
1d678e3c | 15 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
cd27668b | 16 | - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
17 | + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP) | |
dfa53551 | 18 | |
1d678e3c AM |
19 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log-client.o |
20 | $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
21 | diff -urN openssh-2.5.1p1.org/configure.in openssh-2.5.1p1/configure.in | |
22 | --- openssh-2.5.1p1.org/configure.in Wed Feb 21 11:09:36 2001 | |
23 | +++ openssh-2.5.1p1/configure.in Wed Feb 21 11:12:07 2001 | |
24 | @@ -459,7 +459,8 @@ | |
cd27668b | 25 | [ |
26 | if test "x$withval" != "xno" ; then | |
27 | saved_LIBS="$LIBS" | |
1d678e3c | 28 | - LIBS="-lwrap $LIBS" |
cd27668b | 29 | + LIBWRAP="-lwrap" |
a15b61d8 | 30 | + LIBS="$LIBS $LIBWRAP" |
cd27668b | 31 | AC_MSG_CHECKING(for libwrap) |
32 | AC_TRY_LINK( | |
6b669923 | 33 | [ |
1d678e3c | 34 | @@ -470,12 +471,14 @@ |
a15b61d8 | 35 | [ |
36 | AC_MSG_RESULT(yes) | |
37 | AC_DEFINE(LIBWRAP) | |
38 | + AC_SUBST(LIBWRAP) | |
d2e26769 | 39 | TCPW_MSG="yes" |
a15b61d8 | 40 | ], |
41 | [ | |
d2e26769 | 42 | AC_MSG_ERROR([*** libwrap missing]) |
a15b61d8 | 43 | ] |
44 | ) | |
45 | + LIBS="$saved_LIBS" | |
46 | fi | |
47 | ] | |
48 | ) |