diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-02-19 16:28:04 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-02-19 16:28:04 +0000 |
| commit | 41fdc864d82fa777a692ae99f83f7eb8460d0373 (patch) | |
| tree | 6a42c02aa4ce6228f6c471d5234253d3b511e754 | |
| parent | befeb9dc2465b22d22f78521fa1ac39818a83766 (diff) | |
| download | lasso-41fdc864d82fa777a692ae99f83f7eb8460d0373.tar.gz lasso-41fdc864d82fa777a692ae99f83f7eb8460d0373.tar.xz lasso-41fdc864d82fa777a692ae99f83f7eb8460d0373.zip | |
provide wsf support activation status to swig binding; note to Romain: wtf was
LASSO_WSF_ENABLE ? (it appears in rev1.129 of configure.ac without any comment
about its purpose) (I removed it)
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | swig/.cvsignore | 1 | ||||
| -rw-r--r-- | swig/Lasso.i | 18 | ||||
| -rw-r--r-- | swig/wsf-support.i.in | 1 |
4 files changed, 7 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index f52adc3f..7841aa63 100644 --- a/configure.ac +++ b/configure.ac @@ -603,12 +603,12 @@ 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"]) -LASSO_WSF_ENABLE="undef LASSO_WSF_ENABLE" +LASSO_WSF_SUPPORT=0 if test "x$enable_wsf" = "xyes"; then AC_DEFINE(LASSO_WSF_ENABLED, [], [Define if ID-WSF support is enabled]) - LASSO_WSF_ENABLE="define LASSO_WSF_ENABLE" + LASSO_WSF_SUPPORT=1 fi -AC_SUBST(LASSO_WSF_ENABLE) +AC_SUBST(LASSO_WSF_SUPPORT) dnl ========================================================================== @@ -765,6 +765,7 @@ perl/Makefile php/Makefile python/Makefile swig/Makefile +swig/wsf-support.i tests/Makefile tests/data/Makefile tests/data/ca1-la/Makefile diff --git a/swig/.cvsignore b/swig/.cvsignore index 282522db..d9330069 100644 --- a/swig/.cvsignore +++ b/swig/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +wsf-support.i diff --git a/swig/Lasso.i b/swig/Lasso.i index 34e4f8c6..f9b8ea81 100644 --- a/swig/Lasso.i +++ b/swig/Lasso.i @@ -30,7 +30,7 @@ %include exception.i %include typemaps.i - +%include wsf-support.i %{ @@ -685,22 +685,6 @@ SET_NODE_INFO(Node, DowncastableNode) #endif #endif /* ifdef SWIGJAVA */ - -/* Configuration Constants */ -#undef LASSO_WSF_ENABLE - -#ifdef LASSO_WSF_ENABLED -%{ -#define LASSO_WSF_SUPPORT 1 -%} -#define LASSO_WSF_SUPPORT 1 -#else -%{ -#define LASSO_WSF_SUPPORT 0 -%} -#define LASSO_WSF_SUPPORT 0 -#endif - /* HttpMethod */ #ifndef SWIGPHP4 %rename(HTTP_METHOD_NONE) LASSO_HTTP_METHOD_NONE; diff --git a/swig/wsf-support.i.in b/swig/wsf-support.i.in new file mode 100644 index 00000000..fd3fa7cd --- /dev/null +++ b/swig/wsf-support.i.in @@ -0,0 +1 @@ +#define LASSO_WSF_SUPPORT @LASSO_WSF_SUPPORT@ |