[libsoup/wip/tpopela/negotiate] Rename HAVE_GSSAPI to LIBSOUP_HAVE_GSSAPI

[Tomas Popela <tpopela src gnome org>]

commit 30a21ef6f4fde2c4fa21e59511ea3709bba0345a
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Feb 4 16:37:05 2016 +0100

    Rename HAVE_GSSAPI to LIBSOUP_HAVE_GSSAPI

 configure.ac                  |    8 ++++----
 examples/get.c                |    6 +++---
 libsoup-2.4.pc.in             |    2 +-
 libsoup/soup-auth-manager.c   |    4 ++--
 libsoup/soup-auth-negotiate.c |    4 ++--
 libsoup/soup-auth-negotiate.h |    4 ++--
 libsoup/soup-auth.h           |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ce660a4..1468b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,7 +317,7 @@ AC_DEFINE_UNQUOTED(NTLM_AUTH, "$ntlm_auth", [Samba's 'winbind' daemon helper 'nt
 
 AX_CODE_COVERAGE
 
-have_gssapi=""
+libsoup_have_gssapi=""
 
 dnl **********************
 dnl *** GSSAPI support ***
@@ -329,8 +329,8 @@ if test "x$KRB5_CONFIG" != "xnone"; then
     AC_SUBST(KRB5_CFLAGS)
     AC_SUBST(KRB5_LIBS)
     if test "$KRB5_CONFIG" != none; then
-        AC_DEFINE(HAVE_GSSAPI, 1, [Whether or not gssapi libs are available])
-       have_gssapi="1"
+        AC_DEFINE(LIBSOUP_HAVE_GSSAPI, 1, [Whether or not gssapi libs are available])
+        libsoup_have_gssapi="1"
     fi
 fi
 
@@ -357,7 +357,7 @@ dnl *************************
 dnl *** Output Everything ***
 dnl *************************
 
-AC_SUBST(have_gssapi)
+AC_SUBST(libsoup_have_gssapi)
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
diff --git a/examples/get.c b/examples/get.c
index 63ac0b4..9b07ef2 100644
--- a/examples/get.c
+++ b/examples/get.c
@@ -94,7 +94,7 @@ get_url (const char *url)
 
 static const char *ca_file, *proxy;
 static gboolean synchronous, ntlm;
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
 static gboolean negotiate;
 #endif
 
@@ -111,7 +111,7 @@ static GOptionEntry entries[] = {
        { "ntlm", 'n', 0,
          G_OPTION_ARG_NONE, &ntlm,
          "Use NTLM authentication", NULL },
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
        { "negotiate", 'N', 0,
          G_OPTION_ARG_NONE, &negotiate,
          "Use Negotiate authentication", NULL },
@@ -195,7 +195,7 @@ main (int argc, char **argv)
                soup_uri_free (proxy_uri);
        }
 
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
        if (negotiate) {
                soup_session_add_feature_by_type(session,
                                                 SOUP_TYPE_AUTH_NEGOTIATE);
diff --git a/libsoup-2.4.pc.in b/libsoup-2.4.pc.in
index 5f62233..8b05cbc 100644
--- a/libsoup-2.4.pc.in
+++ b/libsoup-2.4.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Requires: glib-2.0 gobject-2.0 gio-2.0
 Requires.private: libxml-2.0
 Libs: -L${libdir} -lsoup-2.4
-Cflags: -I${includedir}/libsoup-2.4 -DHAVE_GSSAPI= have_gssapi@
+Cflags: -I${includedir}/libsoup-2.4 -DLIBSOUP_HAVE_GSSAPI= libsoup_have_gssapi@
diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c
index 95a0c38..41ccd03 100644
--- a/libsoup/soup-auth-manager.c
+++ b/libsoup/soup-auth-manager.c
@@ -19,7 +19,7 @@
 #include "soup-path-map.h"
 #include "soup-session-private.h"
 
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
 #include "soup-auth-negotiate.h"
 #endif
 
@@ -489,7 +489,7 @@ authenticate_auth (SoupAuthManager *manager, SoupAuth *auth,
        } else
                uri = soup_message_get_uri (msg);
 
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
        if (SOUP_IS_AUTH_NEGOTIATE (auth))
                return;
 #endif
diff --git a/libsoup/soup-auth-negotiate.c b/libsoup/soup-auth-negotiate.c
index 41b5093..bf81c99 100644
--- a/libsoup/soup-auth-negotiate.c
+++ b/libsoup/soup-auth-negotiate.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #endif
 
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
 
 #include <string.h>
 
@@ -550,4 +550,4 @@ soup_gss_client_cleanup (SoupNegotiateConnectionState *conn)
 
        gss_release_name (&min_stat, &conn->server_name);
 }
-#endif /* HAVE_GSSAPI */
+#endif /* LIBSOUP_HAVE_GSSAPI */
diff --git a/libsoup/soup-auth-negotiate.h b/libsoup/soup-auth-negotiate.h
index d6d373f..dd565e4 100644
--- a/libsoup/soup-auth-negotiate.h
+++ b/libsoup/soup-auth-negotiate.h
@@ -6,7 +6,7 @@
 #ifndef SOUP_AUTH_NEGOTIATE_H
 #define SOUP_AUTH_NEGOTIATE_H 1
 
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
 
 #include "soup-connection-auth.h"
 
@@ -26,6 +26,6 @@ typedef struct {
 
 } SoupAuthNegotiateClass;
 
-#endif /* HAVE_GSSAPI */
+#endif /* LIBSOUP_HAVE_GSSAPI */
 
 #endif /* SOUP_AUTH_NEGOTIATE_H */
diff --git a/libsoup/soup-auth.h b/libsoup/soup-auth.h
index 19a0edf..03835fa 100644
--- a/libsoup/soup-auth.h
+++ b/libsoup/soup-auth.h
@@ -101,7 +101,7 @@ GType soup_auth_basic_get_type  (void);
 GType soup_auth_digest_get_type (void);
 #define SOUP_TYPE_AUTH_NTLM   (soup_auth_ntlm_get_type ())
 GType soup_auth_ntlm_get_type   (void);
-#if HAVE_GSSAPI
+#if LIBSOUP_HAVE_GSSAPI
 #define SOUP_TYPE_AUTH_NEGOTIATE  (soup_auth_negotiate_get_type ())
 GType soup_auth_negotiate_get_type   (void);
 #endif