diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-01-27 11:51:59 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-01-27 11:51:59 +0000 |
| commit | 5b0be65ba9892ca921e13b858ee231f1e659ef06 (patch) | |
| tree | a66a9080504d9dfe6787603edf80cc808cd78615 | |
| parent | 047c0d45a2e114ebe4ad866aa1bb7feea0cf7b1b (diff) | |
| download | lasso-5b0be65ba9892ca921e13b858ee231f1e659ef06.tar.gz lasso-5b0be65ba9892ca921e13b858ee231f1e659ef06.tar.xz lasso-5b0be65ba9892ca921e13b858ee231f1e659ef06.zip | |
configure flag to enable ID-WSF (off by default)
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | lasso/Makefile.am | 6 | ||||
| -rw-r--r-- | lasso/extract_symbols.py | 9 | ||||
| -rw-r--r-- | swig/Lasso.i | 4 | ||||
| -rw-r--r-- | swig/inheritance.h | 3 |
5 files changed, 31 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 26355262..5ef6bd48 100644 --- a/configure.ac +++ b/configure.ac @@ -565,6 +565,17 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) + +dnl Check if python is explicitly disabled. +AC_ARG_ENABLE(wsf, [ --enable-wsf enable experimental ID-WSF], + enable_wsf="yes", enable_wsf="no") + +AM_CONDITIONAL([WSF_ENABLED],[test "x$enable_wsf" = "xyes"]) +if test "x$enable_wsf" = "xyes"; then + AC_DEFINE(LASSO_WSF_ENABLED, [], [Define if ID-WSF support is enabled]) +fi + + dnl ========================================================================== dnl User specific option. dnl ========================================================================== diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 973f8fcf..9766cb18 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -24,8 +24,12 @@ liblasso_la_SOURCES = lasso.c errors.c types.c: $(PYTHON) $(srcdir)/extract_types.py $(srcdir) +if WSF_ENABLED +SYMBOLS_ARGS = -wsf +endif + symbols.sym: - $(PYTHON) $(srcdir)/extract_symbols.py $(srcdir) > symbols.sym + $(PYTHON) $(srcdir)/extract_symbols.py $(srcdir) $(SYMBOLS_ARGS) > symbols.sym clean-local: -rm types.c symbols.sym diff --git a/lasso/extract_symbols.py b/lasso/extract_symbols.py index 7db9c3b2..5c3ff8ca 100644 --- a/lasso/extract_symbols.py +++ b/lasso/extract_symbols.py @@ -4,7 +4,12 @@ import glob import re import sys -if len(sys.argv) == 2: +enable_wsf = 0 + +if '-wsf' in sys.argv: + enable_wsf = 1 + +if len(sys.argv) == 2+enable_wsf: srcdir = sys.argv[1] else: srcdir = '.' @@ -17,6 +22,8 @@ for header_file in glob.glob('%s/*/*.h' % srcdir) + glob.glob('%s/*.h' % srcdir) wsf = ['lasso_disco', 'lasso_dst', 'lasso_is', 'lasso_profile_service', 'lasso_discovery', 'lasso_wsf', 'lasso_interaction', 'lasso_utility' ] +if enable_wsf: + wsf = [] for s in symbols: for t in wsf: diff --git a/swig/Lasso.i b/swig/Lasso.i index e8999947..49e75d17 100644 --- a/swig/Lasso.i +++ b/swig/Lasso.i @@ -6449,3 +6449,7 @@ int LassoNameRegistration_setSessionFromDump(LassoNameRegistration *self, char * %} +#ifdef LASSO_WSF_ENABLED +%include Lasso-wsf.i +#endif + diff --git a/swig/inheritance.h b/swig/inheritance.h index 133a850e..522d2a41 100644 --- a/swig/inheritance.h +++ b/swig/inheritance.h @@ -77,6 +77,7 @@ SET_NODE_INFO(LibStatusResponse, SamlpResponseAbstract) SET_NODE_INFO(LibLogoutResponse, LibStatusResponse) SET_NODE_INFO(LibRegisterNameIdentifierResponse, LibStatusResponse) +#ifdef LASSO_WSF_ENABLED /* ID-WSF */ @@ -129,3 +130,5 @@ SET_NODE_INFO(IsUserInteraction, Node) /* utility prefix */ SET_NODE_INFO(UtilityStatus, Node) + +#endif /* LASSO_WSF_ENABLED */ |