Merge pull request #836

Author: jmikola

scripts/autotools/libmongoc/CheckSasl.m4

@@ -1,20 +1,10 @@
 PHP_ARG_WITH([mongodb-sasl],
              [whether to enable SASL for Kerberos authentication],
-             [AS_HELP_STRING([--with-mongodb-sasl=@<:@auto/no/cyrus/gssapi@:>@],
+             [AS_HELP_STRING([--with-mongodb-sasl=@<:@auto/no/cyrus@:>@],
                              [MongoDB: Enable SASL for Kerberos authentication [default=auto]])],
              [auto],
              [no])
 
-AS_IF([test "$os_darwin" = "yes" -a \( "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto" \)],[
-  dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds
-  if test "$ext_shared" = "yes"; then
-    MONGODB_SHARED_LIBADD="-framework GSS $MONGODB_SHARED_LIBADD"
-  else
-    PHP_ADD_FRAMEWORK([GSS])
-  fi
-  PHP_MONGODB_SASL="gssapi"
-])
-
 AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[
   found_cyrus="no"
 
@@ -40,23 +30,16 @@ AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[
     fi
   ])
 
-  if test "$PHP_MONGODB_SASL" = "cyrus" -a "$found_cyrus" != "yes"; then
-    AC_MSG_ERROR([Cyrus SASL libraries and development headers could not be found])
+  if test "$found_cyrus" = "yes"; then
+    PHP_CHECK_LIBRARY([sasl2],
+                      [sasl_client_done],
+                      [have_sasl_client_done=yes],
+                      [have_sasl_client_done=no],
+                      $MONGODB_SHARED_LIBADD)
   fi
-])
-
-AS_IF([test "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto"],[
-  found_gssapi="no"
 
-  PKG_CHECK_MODULES([PHP_MONGODB_SASL],[krb5-gssapi],[
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SASL_CFLAGS"
-    PHP_EVAL_LIBLINE([$PHP_MONGODB_SASL_LIBS],[MONGODB_SHARED_LIBADD])
-    PHP_MONGODB_SASL="gssapi"
-    found_gssapi="yes"
-  ])
-
-  if test "$PHP_MONGODB_SASL" = "gssapi" -a "$found_gssapi" != "yes"; then
-    AC_MSG_ERROR([GSSAPI libraries and development headers could not be found])
+  if test "$PHP_MONGODB_SASL" = "cyrus" -a "$found_cyrus" != "yes"; then
+    AC_MSG_ERROR([Cyrus SASL libraries and development headers could not be found])
   fi
 ])
 
@@ -65,34 +48,27 @@ AS_IF([test "$PHP_MONGODB_SASL" = "auto"],[
 ])
 
 dnl Warn for unsupported values (e.g. Cyrus SASL search path)
-if test ! \( "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "no" \); then
+if test ! \( "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "no" \); then
   AC_MSG_WARN([unsupported --with-mongodb-sasl value: $PHP_MONGODB_SASL])
 fi
 
 AC_MSG_CHECKING([which SASL library to use])
 AC_MSG_RESULT([$PHP_MONGODB_SASL])
 
-dnl Disable Windows SSPI
+dnl Disable Windows SSPI and GSSAPI
 AC_SUBST(MONGOC_ENABLE_SASL_SSPI, 0)
+AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0)
 
-if test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "gssapi"; then
+if test "$PHP_MONGODB_SASL" = "cyrus"; then
   AC_SUBST(MONGOC_ENABLE_SASL, 1)
-  if test "$PHP_MONGODB_SASL" = "cyrus" ; then
-    AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 1)
-    AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0)
-    if test "x$have_sasl_client_done" = "xyes"; then
-      AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
-    else
-      AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
-    fi
-  elif test "$PHP_MONGODB_SASL" = "gssapi"; then
-    AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 0)
-    AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 1)
+  AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 1)
+  if test "x$have_sasl_client_done" = "xyes"; then
+    AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
+  else
     AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
   fi
 else
   AC_SUBST(MONGOC_ENABLE_SASL, 0)
   AC_SUBST(MONGOC_ENABLE_SASL_CYRUS, 0)
-  AC_SUBST(MONGOC_ENABLE_SASL_GSSAPI, 0)
   AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
 fi