[cpp-sp] 14/17: The plugins use GSSAPI only if the naming extensions are available

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=218b357247c4f2d2da20780a8eb7975a1a04850b

commit 218b357247c4f2d2da20780a8eb7975a1a04850b
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Tue Jul 19 23:52:25 2016 +0200

    The plugins use GSSAPI only if the naming extensions are available
---
 configure.ac                         | 1 +
 plugins/GSSAPIAttributeExtractor.cpp | 4 ----
 plugins/Makefile.am                  | 9 ++++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index cc87730..f574a55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -938,6 +938,7 @@ AS_IF([test "x$with_gssapi" != xno],
 ]])
      ])
   ])
+AM_CONDITIONAL([GSSAPI_NAMINGEXTS],[test "x$ac_cv_have_decl_gss_get_name_attribute" = xyes])
 
 # Check for unit test support
 AC_CONFIG_FILES([unittests/Makefile])
diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp
index e1650b0..fadfb25 100644
--- a/plugins/GSSAPIAttributeExtractor.cpp
+++ b/plugins/GSSAPIAttributeExtractor.cpp
@@ -26,8 +26,6 @@
 
 #include "internal.h"
 
-#if HAVE_DECL_GSS_GET_NAME_ATTRIBUTE
-
 #include <shibsp/exceptions.h>
 #include <shibsp/Application.h>
 #include <shibsp/SPConfig.h>
@@ -420,5 +418,3 @@ pair<bool,DOMElement*> GSSAPIExtractor::background_load()
 
     return make_pair(false,(DOMElement*)nullptr);
 }
-
-#endif
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b039dd2..be0d7c3 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,7 +14,6 @@ common_sources = \
 plugins_la_SOURCES = \
 	${common_sources} \
 	CaseFoldingAttributeResolver.cpp \
-	GSSAPIAttributeExtractor.cpp \
 	TemplateAttributeResolver.cpp \
 	TransformAttributeResolver.cpp
 
@@ -23,18 +22,22 @@ plugins_lite_la_SOURCES = \
 
 plugins_la_CXXFLAGS = \
 	$(PTHREAD_CFLAGS) \
-	$(gss_CFLAGS) $(gnu_gss_CFLAGS) \
 	$(opensaml_CFLAGS) \
 	$(xerces_CFLAGS) \
 	$(xmltooling_CFLAGS)
 plugins_la_LIBADD = \
 	$(top_builddir)/shibsp/libshibsp.la \
 	$(PTHREAD_LIBS) \
-	$(gss_LIBS) $(gnu_gss_LIBS) \
 	$(opensaml_LIBS) \
 	$(xerces_LIBS) \
 	$(xmltooling_LIBS)
 
+if GSSAPI_NAMINGEXTS
+plugins_la_SOURCES  += GSSAPIAttributeExtractor.cpp
+plugins_la_CXXFLAGS += $(gss_CFLAGS) $(gnu_gss_CFLAGS)
+plugins_la_LIBADD   += $(gss_LIBS)   $(gnu_gss_LIBS)
+endif
+
 plugins_lite_la_LIBADD = \
 	$(top_builddir)/shibsp/libshibsp-lite.la \
 	$(PTHREAD_LIBS) \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.