diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-31 20:25:25 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-31 20:25:25 (GMT) |
| commit | 9be64debafa321a6712a9c500b36136757d588c7 (patch) | |
| tree | d912892649f6d50559b545494fa225e1ea36a24e /src/uscxml | |
| parent | 3b321677e433dbc6f88c9e7faed0857022514efe (diff) | |
| download | uscxml-9be64debafa321a6712a9c500b36136757d588c7.zip uscxml-9be64debafa321a6712a9c500b36136757d588c7.tar.gz uscxml-9be64debafa321a6712a9c500b36136757d588c7.tar.bz2 | |
Corrected configure-time check for SMTP in curl
Diffstat (limited to 'src/uscxml')
| -rw-r--r-- | src/uscxml/Factory.cpp | 15 | ||||
| -rw-r--r-- | src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index c2177d9..f975f39 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -39,9 +39,11 @@ # include "uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h" # include "uscxml/plugins/invoker/system/SystemInvoker.h" # include "uscxml/plugins/invoker/xhtml/XHTMLInvoker.h" -# include "uscxml/plugins/invoker/smtp/SMTPInvoker.h" # include "uscxml/plugins/invoker/imap/IMAPInvoker.h" +# ifdef CURL_HAS_SMTP +# include "uscxml/plugins/invoker/smtp/SMTPInvoker.h" +# endif #ifdef PROTOBUF_FOUND //# include "uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.h" @@ -269,6 +271,13 @@ Factory::Factory() { #endif #endif +#ifdef CURL_HAS_SMTP + { + SMTPInvoker* invoker = new SMTPInvoker(); + registerInvoker(invoker); + } +#endif + // these are always available { NULLDataModel* dataModel = new NULLDataModel(); @@ -280,10 +289,6 @@ Factory::Factory() { registerInvoker(invoker); } { - SMTPInvoker* invoker = new SMTPInvoker(); - registerInvoker(invoker); - } - { IMAPInvoker* invoker = new IMAPInvoker(); registerInvoker(invoker); } diff --git a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp index 17b5cb4..dda51b7 100644 --- a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp +++ b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.cpp @@ -81,8 +81,8 @@ boost::shared_ptr<IOProcessorImpl> SCXMLIOProcessor::create(InterpreterImpl* int Data SCXMLIOProcessor::getDataModelVariables() { Data data; - if(_url.length() > 0); - data.compound["location"] = Data(_url, Data::VERBATIM); + if(_url.length() > 0) + data.compound["location"] = Data(_url, Data::VERBATIM); return data; } |