From: cantor <cantor@3ebe4818-3638-0410-822d-ece5924dabe2>
Date: Sun, 19 Sep 2010 17:43:10 +0000 (+0000)
Subject: Adjust for rename of src folder, add test for new 2.4-specific feature.
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fresolver.git;a=commitdiff_plain;h=dcc1935a3c30e1a7205937f8922a9df04cbb4ee4;ds=sidebyside

Adjust for rename of src folder, add test for new 2.4-specific feature.

git-svn-id: https://svn.middleware.georgetown.edu/shib-extension/cpp-sp-resolver/trunk@266 3ebe4818-3638-0410-822d-ece5924dabe2
---

diff --git a/Makefile.am b/Makefile.am
index 580cd74..d9fe83f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = doc src
+SUBDIRS = doc shibresolver
 
-DIST_SUBDIRS = doc src
+DIST_SUBDIRS = doc shibresolver
 
 GENFILES = resolver.spec Portfile
 
diff --git a/configure.ac b/configure.ac
index ee54541..0ab9637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,15 @@ AC_TRY_LINK(
     [AC_DEFINE(HAVE_SHIBSP,1,[Define if Shibboleth SP library was found])],
     [AC_MSG_ERROR([unable to link with Shibboleth SP])])
 
+AC_MSG_CHECKING([whether SP library supports non-plugin remoting])
+AC_TRY_COMPILE([#include <shibsp/ServiceProvider.hpp>],
+    [shibsp::ServiceProvider* sp;
+     sp->regListener(NULL,NULL);
+    ],
+    [AC_MSG_RESULT([yes])]
+    [AC_DEFINE([SHIBRESOLVER_SHIBSP_HAS_REMOTING], [1], [Define to 1 if Shibboleth SP supports non-plugin remoting.])],
+    [AC_MSG_RESULT([no])])
+
 # restore master libs
 LIBS="$save_LIBS"
 
@@ -254,7 +263,7 @@ AC_SUBST(XMLSEC_LIBS)
 AC_CONFIG_FILES([resolver.spec Portfile])
 
 # output the underlying makefiles
-AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile shibresolver/Makefile])
 
 LIBTOOL="$LIBTOOL --silent"