Import CUPS trunk (1.4svn) r7116.

[thirdparty/cups.git] / config-scripts / cups-gssapi.m4

diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index 9d50a3cbfe5a5e36b197853e865fbb2e0ffb93cd..968a5fe36865097332a45e755417e9d2eb70421e 100644 (file)
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -23,14 +23,26 @@ LIBGSSAPI=""
 if test x$enable_gssapi != xno; then
        AC_PATH_PROG(KRB5CONFIG, krb5-config)
        if test "x$KRB5CONFIG" != x; then
-               if test "x$uname" = "xDarwin"; then
-                       # Mac OS X weak-links to the Kerberos framework...
-                       LIBGSSAPI="-weak_framework Kerberos"
-               else
-                       CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
-                       CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
-                       LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-               fi
+               case "$uname" in
+                       Darwin)
+                               # Mac OS X weak-links to the Kerberos framework...
+                               LIBGSSAPI="-weak_framework Kerberos"
+                               ;;
+                       SunOS*)
+                               # Solaris has a non-standard krb5-config, don't use it!
+                               AC_CHECK_LIB(gss, gss_display_status,
+                                       AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
+                                       CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"         
+                                       CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"             
+                                       LIBGSSAPI="-lgss `$KRB5CONFIG --libs`")
+                               ;;
+                       *)
+                               # Other platforms just ask for GSSAPI
+                               CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
+                               CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
+                               LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
+                               ;;
+               esac
                AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
        else
                # Check for vendor-specific implementations...