]>
Commit | Line | Data |
---|---|---|
1 | diff -urN openssh-3.0p1.orig/Makefile.in openssh-3.0p1/Makefile.in | |
2 | --- openssh-3.0p1.orig/Makefile.in Mon Oct 22 02:53:59 2001 | |
3 | +++ openssh-3.0p1/Makefile.in Wed Nov 7 15:47:33 2001 | |
4 | @@ -30,6 +30,7 @@ | |
5 | CFLAGS=@CFLAGS@ | |
6 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | |
7 | LIBS=@LIBS@ | |
8 | +LIBWRAP=@LIBWRAP@ | |
9 | AR=@AR@ | |
10 | RANLIB=@RANLIB@ | |
11 | INSTALL=@INSTALL@ | |
12 | @@ -98,7 +99,7 @@ | |
13 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
14 | ||
15 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | |
16 | - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
17 | + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP) | |
18 | ||
19 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o | |
20 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | |
21 | diff -urN openssh-3.0p1.orig/configure.ac openssh-3.0p1/configure.ac | |
22 | --- openssh-3.0p1.orig/configure.ac Sat Nov 3 20:09:33 2001 | |
23 | +++ openssh-3.0p1/configure.ac Wed Nov 7 15:48:55 2001 | |
24 | @@ -546,7 +546,9 @@ | |
25 | CPPFLAGS="-I${withval} ${CPPFLAGS}" | |
26 | fi | |
27 | fi | |
28 | - LIBS="-lwrap $LIBS" | |
29 | + LIBWRAP="-lwrap" | |
30 | + LIBS="$LIBS $LIBWRAP" | |
31 | + | |
32 | AC_MSG_CHECKING(for libwrap) | |
33 | AC_TRY_LINK( | |
34 | [ | |
35 | @@ -557,12 +559,14 @@ | |
36 | [ | |
37 | AC_MSG_RESULT(yes) | |
38 | AC_DEFINE(LIBWRAP) | |
39 | + AC_SUBST(LIBWRAP) | |
40 | TCPW_MSG="yes" | |
41 | ], | |
42 | [ | |
43 | AC_MSG_ERROR([*** libwrap missing]) | |
44 | ] | |
45 | ) | |
46 | + LIBS="$saved_LIBS" | |
47 | fi | |
48 | ] | |
49 | ) |