|
1 | 1 | PHP_ARG_WITH([mongodb-sasl], |
2 | 2 | [whether to enable SASL for Kerberos authentication], |
3 | | - [AS_HELP_STRING([--with-mongodb-sasl=@<:@auto/no/cyrus/gssapi@:>@], |
| 3 | + [AS_HELP_STRING([--with-mongodb-sasl=@<:@auto/no/cyrus@:>@], |
4 | 4 | [MongoDB: Enable SASL for Kerberos authentication [default=auto]])], |
5 | 5 | [auto], |
6 | 6 | [no]) |
7 | 7 |
|
8 | | -AS_IF([test "$os_darwin" = "yes" -a \( "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto" \)],[ |
9 | | - dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds |
10 | | - if test "$ext_shared" = "yes"; then |
11 | | - MONGODB_SHARED_LIBADD="-framework GSS $MONGODB_SHARED_LIBADD" |
12 | | - else |
13 | | - PHP_ADD_FRAMEWORK([GSS]) |
14 | | - fi |
15 | | - PHP_MONGODB_SASL="gssapi" |
16 | | -]) |
17 | | - |
18 | 8 | AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[ |
19 | 9 | found_cyrus="no" |
20 | 10 |
|
@@ -45,54 +35,32 @@ AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[ |
45 | 35 | fi |
46 | 36 | ]) |
47 | 37 |
|
48 | | -AS_IF([test "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto"],[ |
49 | | - found_gssapi="no" |
50 | | -
|
51 | | - PKG_CHECK_MODULES([PHP_MONGODB_SASL],[krb5-gssapi],[ |
52 | | - PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SASL_CFLAGS" |
53 | | - PHP_EVAL_LIBLINE([$PHP_MONGODB_SASL_LIBS],[MONGODB_SHARED_LIBADD]) |
54 | | - PHP_MONGODB_SASL="gssapi" |
55 | | - found_gssapi="yes" |
56 | | - ]) |
57 | | -
|
58 | | - if test "$PHP_MONGODB_SASL" = "gssapi" -a "$found_gssapi" != "yes"; then |
59 | | - AC_MSG_ERROR([GSSAPI libraries and development headers could not be found]) |
60 | | - fi |
61 | | -]) |
62 | | - |
63 | 38 | AS_IF([test "$PHP_MONGODB_SASL" = "auto"],[ |
64 | 39 | PHP_MONGODB_SASL="no" |
65 | 40 | ]) |
66 | 41 |
|
67 | 42 | dnl Warn for unsupported values (e.g. Cyrus SASL search path) |
68 | | -if test ! \( "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "no" \); then |
| 43 | +if test ! \( "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "no" \); then |
69 | 44 | AC_MSG_WARN([unsupported --with-mongodb-sasl value: $PHP_MONGODB_SASL]) |
70 | 45 | fi |
71 | 46 |
|
72 | 47 | AC_MSG_CHECKING([which SASL library to use]) |
73 | 48 | AC_MSG_RESULT([$PHP_MONGODB_SASL]) |
74 | 49 |
|
75 | | -dnl Disable Windows SSPI |
| 50 | +dnl Disable Windows SSPI and GSSAPI |
76 | 51 | AC_SUBST(MONGOC_ENABLE_SASL_SSPI, 0) |
| 52 | +AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0) |
77 | 53 |
|
78 | | -if test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "gssapi"; then |
| 54 | +if test "$PHP_MONGODB_SASL" = "cyrus"; then |
79 | 55 | AC_SUBST(MONGOC_ENABLE_SASL, 1) |
80 | | - if test "$PHP_MONGODB_SASL" = "cyrus" ; then |
81 | | - AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 1) |
82 | | - AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0) |
83 | | - if test "x$have_sasl_client_done" = "xyes"; then |
84 | | - AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1) |
85 | | - else |
86 | | - AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0) |
87 | | - fi |
88 | | - elif test "$PHP_MONGODB_SASL" = "gssapi"; then |
89 | | - AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 0) |
90 | | - AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 1) |
| 56 | + AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 1) |
| 57 | + if test "x$have_sasl_client_done" = "xyes"; then |
| 58 | + AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1) |
| 59 | + else |
91 | 60 | AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0) |
92 | 61 | fi |
93 | 62 | else |
94 | 63 | AC_SUBST(MONGOC_ENABLE_SASL, 0) |
95 | 64 | AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 0) |
96 | | - AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0) |
97 | 65 | AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0) |
98 | 66 | fi |
0 commit comments