]>
Commit | Line | Data |
---|---|---|
39c53e2a AM |
1 | diff -urN samba-2.0.7.org/source/configure.in samba-2.0.7/source/configure.in |
2 | --- samba-2.0.7.org/source/configure.in Thu Oct 19 00:01:24 2000 | |
3 | +++ samba-2.0.7/source/configure.in Fri Oct 20 21:17:32 2000 | |
4 | @@ -444,6 +444,11 @@ | |
5 | fi | |
6 | ||
7 | # | |
8 | +# Check for yp_get_default_domain in -lnsl (linux glibc2.1) | |
9 | +# | |
10 | +AC_LIBTESTFUNC(nsl, yp_get_default_domain) | |
11 | + | |
12 | +# | |
13 | # Check for the functions putprpwnam, set_auth_parameters, | |
14 | # getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity | |
15 | # Needed for OSF1 and HPUX. | |
16 | @@ -1292,7 +1297,7 @@ | |
17 | yes) | |
18 | AC_MSG_RESULT(yes) | |
19 | AC_DEFINE(WITH_PAM) | |
20 | - LIBS="$LIBS -lpam" | |
21 | + LIBS="$LIBS -ldl -lpam -lpamc" | |
22 | ;; | |
23 | *) | |
24 | AC_MSG_RESULT(no) | |
25 | @@ -1368,7 +1374,7 @@ | |
26 | yes) | |
27 | AC_MSG_RESULT(yes) | |
28 | AC_DEFINE(WITH_SSL) | |
29 | - withval="/usr/local/ssl" # default | |
30 | + withval="/usr" # default | |
31 | ||
32 | if test "${with_sslinc+set}" = set; then | |
33 | ||
34 | @@ -1376,12 +1382,11 @@ | |
35 | case "$withval" in | |
36 | yes|no) | |
37 | echo "configure: warning: --with-sslinc called without argument - will use default" 1>&w | |
38 | - CFLAGS="-I/usr/local/ssl/include $CFLAGS" | |
39 | + CFLAGS="-I/usr/include/openssl $CFLAGS" | |
40 | LIBS="-lssl -lcrypto $LIBS" | |
41 | - LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS" | |
42 | ;; | |
43 | * ) | |
44 | - CFLAGS="-I${withval}/include $CFLAGS" | |
45 | + CFLAGS="-I${withval}/include/openssl $CFLAGS" | |
46 | LIBS="-lssl -lcrypto $LIBS" | |
47 | LDFLAGS="-L${withval}/lib $LDFLAGS" | |
48 | ;; | |
49 | diff -urN samba-2.0.7.org/source/smbwrapper/smbsh.in samba-2.0.7/source/smbwrapper/smbsh.in | |
50 | --- samba-2.0.7.org/source/smbwrapper/smbsh.in Thu Oct 19 00:01:27 2000 | |
51 | +++ samba-2.0.7/source/smbwrapper/smbsh.in Fri Oct 20 21:16:46 2000 | |
b182d209 | 52 | @@ -1,6 +1,6 @@ |
53 | #! /bin/sh | |
54 | ||
55 | -SMBW_LIBDIR=${SMBW_LIBDIR-@builddir@/smbwrapper} | |
56 | +SMBW_LIBDIR=${SMBW_LIBDIR-/lib/security} | |
57 | ||
58 | if [ ! -f ${SMBW_LIBDIR}/smbwrapper.so ]; then | |
59 | echo You need to set LIBDIR in smbsh |