projects
/
shibboleth
/
cpp-sp-resolver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ee3247
)
Adjust for rename of src folder, add test for new 2.4-specific feature.
author
Scott Cantor
<cantor.2@osu.edu>
Sun, 19 Sep 2010 17:43:10 +0000
(17:43 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Sun, 19 Sep 2010 17:43:10 +0000
(17:43 +0000)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
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
\r
ACLOCAL_AMFLAGS = -I .
\r
\r
-SUBDIRS = doc s
rc
\r
+SUBDIRS = doc s
hibresolver
\r
\r
\r
-DIST_SUBDIRS = doc s
rc
\r
+DIST_SUBDIRS = doc s
hibresolver
\r
\r
GENFILES = resolver.spec Portfile
\r
\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_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
# 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([resolver.spec Portfile])
\r
\r
# output the underlying makefiles
\r
-AC_CONFIG_FILES([Makefile doc/Makefile s
rc
/Makefile])
\r
+AC_CONFIG_FILES([Makefile doc/Makefile s
hibresolver
/Makefile])
\r
\r
LIBTOOL="$LIBTOOL --silent"
\r
\r
\r
LIBTOOL="$LIBTOOL --silent"
\r
\r