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 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign
 \r
 ACLOCAL_AMFLAGS = -I .\r
 \r
-SUBDIRS = doc src\r
+SUBDIRS = doc shibresolver\r
 \r
-DIST_SUBDIRS = doc src\r
+DIST_SUBDIRS = doc shibresolver\r
 \r
 GENFILES = resolver.spec Portfile\r
 \r

diff --git a/configure.ac b/configure.ac
index ee54541..0ab9637 100644 (file)
--- 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])],\r
     [AC_MSG_ERROR([unable to link with Shibboleth SP])])\r
 \r
+AC_MSG_CHECKING([whether SP library supports non-plugin remoting])\r
+AC_TRY_COMPILE([#include <shibsp/ServiceProvider.hpp>],\r
+    [shibsp::ServiceProvider* sp;\r
+     sp->regListener(NULL,NULL);\r
+    ],\r
+    [AC_MSG_RESULT([yes])]\r
+    [AC_DEFINE([SHIBRESOLVER_SHIBSP_HAS_REMOTING], [1], [Define to 1 if Shibboleth SP supports non-plugin remoting.])],\r
+    [AC_MSG_RESULT([no])])\r
+\r
 # restore master libs\r
 LIBS="$save_LIBS"\r
 \r
@@ -254,7 +263,7 @@ AC_SUBST(XMLSEC_LIBS)
 AC_CONFIG_FILES([resolver.spec Portfile])\r
 \r
 # output the underlying makefiles\r
-AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile])\r
+AC_CONFIG_FILES([Makefile doc/Makefile shibresolver/Makefile])\r
 \r
 LIBTOOL="$LIBTOOL --silent"\r
 \r