mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Do not compile xmlrpc-c (and related code) when curl wasn't found

Browse Source
This commit is contained in:
Sanel Zukan 2009-07-06 15:10:53 +00:00
parent dfd2355c18
commit fffdfec7e7
2 changed files with 99 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ede-bug-tools/ede-bug-report/Jamfile
View File

@ -23,13 +23,19 @@ XMLRPC_C_FLAGS =
-I [ FDirName $(XMLRPC_C_SRC_PATH) deps expat xmltok ] ; -I [ FDirName $(XMLRPC_C_SRC_PATH) deps expat xmltok ] ;
# ede-bug-report related builds # ede-bug-report related builds
SOURCE = Bugzilla.cpp BugzillaSender.cpp PulseProgress.cpp ede-bug-report.cpp ; SOURCE = ede-bug-report.cpp ;
BINARY = ede-bug-report ; BINARY = ede-bug-report ;
# with curl compile the rest
if $(CURL_CFLAGS) || $(CURL_LIBS) {
SOURCE += Bugzilla.cpp BugzillaSender.cpp PulseProgress.cpp ;
}
ObjectC++Flags $(SOURCE) : $(WNO_LONG_LONG) $(XMLRPC_C_FLAGS) $(CURL_CFLAGS) ; ObjectC++Flags $(SOURCE) : $(WNO_LONG_LONG) $(XMLRPC_C_FLAGS) $(CURL_CFLAGS) ;
EdeProgram $(BINARY) : $(SOURCE) ; EdeProgram $(BINARY) : $(SOURCE) ;
TranslationStrings locale : $(SOURCE) ; TranslationStrings locale : $(SOURCE) ;
if $(CURL_CFLAGS) || $(CURL_LIBS) {
# link against xmlrpc-c libraries # link against xmlrpc-c libraries
LinkAgainst $(BINARY) : -L$(XMLRPC_C_LIB_DIR) LinkAgainst $(BINARY) : -L$(XMLRPC_C_LIB_DIR)
-lxmlrpc_local -lxmlrpc_local
@ -118,3 +124,5 @@ XmlrpcLibrary libxmlrpc_util_local : $(LIBUTIL_SRC) ;
XmlrpcLibrary libxmlparse_local : $(XMLPARSE_SRC) ; XmlrpcLibrary libxmlparse_local : $(XMLPARSE_SRC) ;
XmlrpcLibrary libxmltok_local : $(XMLTOK_SRC) ; XmlrpcLibrary libxmltok_local : $(XMLTOK_SRC) ;
XmlrpcLibrary libcurl_transport_local : $(CURL_TRANSPORT_SRC) ; XmlrpcLibrary libcurl_transport_local : $(CURL_TRANSPORT_SRC) ;
} # CURL_CFLAGS || CURL_LIBS

11
ede-bug-tools/ede-bug-report/ede-bug-report.cpp
View File

@ -31,10 +31,12 @@
#include <edelib/Regex.h> #include <edelib/Regex.h>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#ifdef HAVE_CURL
#include "BugzillaSender.h" #include "BugzillaSender.h"
#include "BugImage.h" #include "BugImage.h"
#include "icons/bug.xpm" #include "icons/bug.xpm"
#endif
EDELIB_NS_USING(String) EDELIB_NS_USING(String)
EDELIB_NS_USING(Regex) EDELIB_NS_USING(Regex)
@ -42,6 +44,7 @@ EDELIB_NS_USING(alert)
EDELIB_NS_USING(message) EDELIB_NS_USING(message)
EDELIB_NS_USING(RX_CASELESS) EDELIB_NS_USING(RX_CASELESS)
#ifdef HAVE_CURL
static Fl_Input *bug_title_input; static Fl_Input *bug_title_input;
static Fl_Input *email_input; static Fl_Input *email_input;
static Fl_Text_Buffer *text_buf; static Fl_Text_Buffer *text_buf;
@ -125,8 +128,15 @@ static void send_cb(Fl_Widget*, void *w) {
if(bugzilla_send_with_progress(title.c_str(), content.c_str())) if(bugzilla_send_with_progress(title.c_str(), content.c_str()))
close_cb(0, w); close_cb(0, w);
} }
#endif /* HAVE_CURL */
int main(int argc, char** argv) { int main(int argc, char** argv) {
#ifndef HAVE_CURL
alert(_("ede-bug-report was compiled without cURL support.\n"
"You can install cURL either via your distribution package management system, or download "
"it from http://curl.haxx.se. After this, you'll have to recompile ede-bug-report again"));
return 1;
#else
/* in case if debugger output was given */ /* in case if debugger output was given */
const char *gdb_output = NULL; const char *gdb_output = NULL;
@ -181,4 +191,5 @@ int main(int argc, char** argv) {
/* win->show(argc, argv); */ /* win->show(argc, argv); */
win->show(); win->show();
return Fl::run(); return Fl::run();
#endif /* HAVE_CURL */
} }