]>
Commit | Line | Data |
---|---|---|
a9a40bfe SZ |
1 | diff -Naur openssh-2.1.1p1/Makefile.in openssh-2.1.1p1-p/Makefile.in |
2 | --- openssh-2.1.1p1/Makefile.in Sat Jun 3 16:57:40 2000 | |
3 | +++ openssh-2.1.1p1-p/Makefile.in Mon Jun 12 16:33:55 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@ | |
a9a40bfe | 12 | @@ -72,7 +73,7 @@ |
cd27668b | 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) | |
a9a40bfe SZ |
21 | diff -Naur openssh-2.1.1p1/configure.in openssh-2.1.1p1-p/configure.in |
22 | --- openssh-2.1.1p1/configure.in Fri Jun 9 03:58:35 2000 | |
23 | +++ openssh-2.1.1p1-p/configure.in Mon Jun 12 16:33:55 2000 | |
24 | @@ -814,8 +814,11 @@ | |
a15b61d8 | 25 | [ --with-tcp-wrappers Enable tcpwrappers support], |
cd27668b | 26 | [ |
27 | if test "x$withval" != "xno" ; then | |
a15b61d8 | 28 | + # we need to add -lwrap to LIBS only for configure |
29 | + # testing, and then remove | |
cd27668b | 30 | saved_LIBS="$LIBS" |
31 | - LIBS="$LIBS -lwrap" | |
32 | + LIBWRAP="-lwrap" | |
a15b61d8 | 33 | + LIBS="$LIBS $LIBWRAP" |
cd27668b | 34 | AC_MSG_CHECKING(for libwrap) |
35 | AC_TRY_LINK( | |
6b669923 | 36 | [ |
a9a40bfe | 37 | @@ -826,6 +829,7 @@ |
a15b61d8 | 38 | [ |
39 | AC_MSG_RESULT(yes) | |
40 | AC_DEFINE(LIBWRAP) | |
41 | + AC_SUBST(LIBWRAP) | |
42 | ], | |
43 | [ | |
44 | AC_MSG_RESULT(no) | |
a9a40bfe | 45 | @@ -833,6 +837,7 @@ |
a15b61d8 | 46 | LIBS="$saved_LIBS" |
47 | ] | |
48 | ) | |
49 | + LIBS="$saved_LIBS" | |
50 | fi | |
51 | ] | |
52 | ) |