1 | --- configure.orig 2004-06-30 01:04:12.000000000 -0700 |
---|
2 | +++ configure 2008-01-08 23:18:01.000000000 -0800 |
---|
3 | @@ -2640,7 +2640,7 @@ |
---|
4 | fi |
---|
5 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
---|
6 | done |
---|
7 | -rm -f conftest* |
---|
8 | +rm -rf conftest* |
---|
9 | if test -n "$ac_declaration"; then |
---|
10 | echo '#ifdef __cplusplus' >>confdefs.h |
---|
11 | echo $ac_declaration >>confdefs.h |
---|
12 | @@ -5036,7 +5036,7 @@ |
---|
13 | echo "$as_me:$LINENO: checking for libssl" >&5 |
---|
14 | echo $ECHO_N "checking for libssl... $ECHO_C" >&6 |
---|
15 | for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do |
---|
16 | - if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then |
---|
17 | + if test -r "${p}/libssl.a" -o -r "${p}/libssl.dylib" ; then |
---|
18 | OPENSSL_LDFLAGS="-L${p}" |
---|
19 | echo "$as_me:$LINENO: result: found in ${p}" >&5 |
---|
20 | echo "${ECHO_T}found in ${p}" >&6 |
---|
21 | @@ -5328,7 +5328,7 @@ |
---|
22 | echo "$as_me:$LINENO: checking for pam library" >&5 |
---|
23 | echo $ECHO_N "checking for pam library... $ECHO_C" >&6 |
---|
24 | for p in `eval "echo {${PAMLOCATIONS}}{/lib,/lib64}"` ; do |
---|
25 | - if test -r "${p}/libpam.a" -o -r "${p}/libpam.so" ; then |
---|
26 | + if test -r "${p}/libpam.a" -o -r "${p}/libpam.dylib" ; then |
---|
27 | PAM_LDFLAGS="-L${p}" |
---|
28 | echo "$as_me:$LINENO: result: found in ${p}" >&5 |
---|
29 | echo "${ECHO_T}found in ${p}" >&6 |
---|
30 | @@ -5343,7 +5343,7 @@ |
---|
31 | echo "$as_me:$LINENO: checking for pam headers" >&5 |
---|
32 | echo $ECHO_N "checking for pam headers... $ECHO_C" >&6 |
---|
33 | for p in `eval "echo {${PAMLOCATIONS}}{/include,/include/pam,,/pam}"` ; do |
---|
34 | - if test -r "${p}/security/pam_appl.h" ; then |
---|
35 | + if test -r "${p}/pam_appl.h"; then |
---|
36 | PAM_INCLUDES="-I${p}" |
---|
37 | echo "$as_me:$LINENO: result: found in ${p}" >&5 |
---|
38 | echo "${ECHO_T}found in ${p}" >&6 |
---|
39 | @@ -5374,7 +5374,7 @@ |
---|
40 | cat >>conftest.$ac_ext <<_ACEOF |
---|
41 | /* end confdefs.h. */ |
---|
42 | |
---|
43 | - #include <security/pam_appl.h> |
---|
44 | + #include <pam_appl.h> |
---|
45 | main(int argc,char **argv) { |
---|
46 | } |
---|
47 | |
---|
48 | @@ -5447,7 +5447,7 @@ |
---|
49 | |
---|
50 | |
---|
51 | |
---|
52 | - CCLIENTLOCATIONS="/usr,/usr/local" |
---|
53 | + CCLIENTLOCATIONS="/usr,/usr/local,/opt/local" |
---|
54 | HAVE_CCLIENT="no" |
---|
55 | CCLIENT_LIBS="" |
---|
56 | CCLIENT_INCLUDES="" |
---|
57 | @@ -5496,8 +5496,8 @@ |
---|
58 | { (exit 1); exit 1; }; } |
---|
59 | |
---|
60 | else |
---|
61 | - SOP=".so,.a" |
---|
62 | - test "${PREFER_SO}" = "no" && SOP=".a,.so" |
---|
63 | + SOP=".dylib,.a" |
---|
64 | + test "${PREFER_SO}" = "no" && SOP=".a,.dylib" |
---|
65 | |
---|
66 | echo "$as_me:$LINENO: checking for c-client library" >&5 |
---|
67 | echo $ECHO_N "checking for c-client library... $ECHO_C" >&6 |
---|