From 3777182adc959b4901fd3363774cdef0e7fe8344 Mon Sep 17 00:00:00 2001 From: David Freese Date: Fri, 2 Aug 2013 08:06:00 -0500 Subject: [PATCH] XMLRPC * removed references to external xmlrpc-c library --- configure.ac | 8 -------- doc/Makefile.am | 4 +--- m4/xmlrpc.m4 | 24 ------------------------ src/Makefile.am | 8 ++------ src/dialogs/fl_digi.cxx | 4 ---- src/include/threads.h | 2 -- src/main.cxx | 19 +------------------ src/misc/configuration.cxx | 4 ---- 8 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 m4/xmlrpc.m4 diff --git a/configure.ac b/configure.ac index bb429e37..5ef0b1e5 100644 --- a/configure.ac +++ b/configure.ac @@ -196,13 +196,6 @@ AC_FLDIGI_BIND # Set HAVE_FLUID Makefile conditional AC_FLDIGI_FLTK -### XML-RPC library -# Set ac_cv_xmlrpc to yes/no -# Substitute XMLRPC_CFLAGS and XMLRPC_LIBS in Makefile -# Define USE_XMLRPC in config.h -# Set ENABLE_XMLRPC Makefile conditional -AC_FLDIGI_XMLRPC - ### OSS # Set ac_cv_oss to yes/no # Define USE_OSS in config.h @@ -331,6 +324,5 @@ if test "x$ac_cv_want_fldigi" = "xyes"; then pulseaudio .................. $ac_cv_pulseaudio hamlib ...................... $ac_cv_hamlib - xmlrpc ...................... $ac_cv_xmlrpc ]) fi diff --git a/doc/Makefile.am b/doc/Makefile.am index 7e277b78..57983238 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,9 +10,7 @@ ASCIIDOC_HTML = if WANT_FLDIGI ASCIIDOC_MAN_INST += fldigi.1 -if ENABLE_XMLRPC - ASCIIDOC_MAN_INST += fldigi-shell.1 -endif + ASCIIDOC_MAN_INST += fldigi-shell.1 ASCIIDOC_HTML += guide.html endif diff --git a/m4/xmlrpc.m4 b/m4/xmlrpc.m4 deleted file mode 100644 index 35452c57..00000000 --- a/m4/xmlrpc.m4 +++ /dev/null @@ -1,24 +0,0 @@ -AC_DEFUN([AC_FLDIGI_XMLRPC], [ - AC_ARG_WITH([xmlrpc], - AC_HELP_STRING([--with-xmlrpc], [enable xmlrpc server support @<:@autodetect@:>@]), - [case "${withval}" in - yes|no) ac_cv_want_xmlrpc="${withval}" ;; - *) AC_MSG_ERROR([bad value "${withval}" for --with-xmlrpc]) ;; - esac], - [ac_cv_want_xmlrpc=check]) - - if test "x$ac_cv_want_xmlrpc" = "xno"; then - AC_DEFINE(USE_XMLRPC, 0, [Define to 1 if we are using xmlrpc]) - ac_cv_xmlrpc=no - else - ac_cv_xmlrpc=yes - AC_DEFINE(USE_XMLRPC, 1, [Define to 1 if we are using xmlrpc]) - fi - - if test "x$ac_cv_xmlrpc" = "xyes"; then - AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], ["Builtin"], [XMLRPC-C version]) - else - AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], [""], [XMLRPC-C version]) - fi - AM_CONDITIONAL([ENABLE_XMLRPC], [test "x$ac_cv_xmlrpc" = "xyes"]) -]) diff --git a/src/Makefile.am b/src/Makefile.am index 2fdce002..8602d8fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,8 @@ EXTRA_flarq_SOURCES = $(FLARQ_WIN32_RES_SRC) $(COMMON_WIN32_RES_SRC) fldigi_SOURCES = flarq_SOURCES = +fldigi_SOURCES += $(XMLRPC_SRC) + if ENABLE_HAMLIB fldigi_SOURCES += $(HAMLIB_SRC) endif @@ -53,10 +55,6 @@ if NEED_HAMLIB_LOCATOR fldigi_SOURCES += $(LOCATOR_SRC) endif -if ENABLE_XMLRPC - fldigi_SOURCES += $(XMLRPC_SRC) -endif - if ENABLE_BENCHMARK fldigi_SOURCES += $(BENCHMARK_SRC) endif @@ -117,13 +115,11 @@ endif install-exec-local: if WANT_FLDIGI -if ENABLE_XMLRPC if test -f $(srcdir)/../scripts/fldigi-shell; then \ $(mkinstalldirs) $(DESTDIR)/$(bindir); \ $(INSTALL_SCRIPT) $(srcdir)/../scripts/fldigi-shell $(DESTDIR)/$(bindir); \ fi endif -endif install-data-local: if WANT_FLDIGI diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index df18c4c5..b9537737 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -140,9 +140,7 @@ #include "soundconf.h" #include "htmlstrings.h" -#if USE_XMLRPC # include "xmlrpc.h" -#endif #if BENCHMARK_MODE # include "benchmark.h" #endif @@ -6856,10 +6854,8 @@ void qsy(long long rfc, int fmid) else if (progdefaults.chkUSEHAMLIBis) REQ(hamlib_set_qsy, rfc); #endif -#if USE_XMLRPC else if (progdefaults.chkUSEXMLRPCis) REQ(xmlrpc_set_qsy, rfc); -#endif else LOG_VERBOSE("Ignoring rfcarrier change request (no rig control)"); } diff --git a/src/include/threads.h b/src/include/threads.h index 4fe9ac19..44445c9c 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -40,9 +40,7 @@ int pthread_cond_timedwait_rel(pthread_cond_t* cond, pthread_mutex_t* mutex, dou enum { INVALID_TID = -1, TRX_TID, QRZ_TID, RIGCTL_TID, NORIGCTL_TID, EQSL_TID, ADIF_RW_TID, -#if USE_XMLRPC XMLRPC_TID, -#endif ARQ_TID, ARQSOCKET_TID, FLMAIN_TID, NUM_THREADS, NUM_QRUNNER_THREADS = NUM_THREADS - 1 diff --git a/src/main.cxx b/src/main.cxx index f9a69298..59652f19 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -104,9 +104,7 @@ #include "qrunner.h" #include "stacktrace.h" -#if USE_XMLRPC - #include "xmlrpc.h" -#endif +#include "xmlrpc.h" #if BENCHMARK_MODE #include "benchmark.h" @@ -215,9 +213,7 @@ void delayed_startup(void *) grpTalker->hide(); #endif -#if USE_XMLRPC XML_RPC_Server::start(progdefaults.xmlrpc_address.c_str(), progdefaults.xmlrpc_port.c_str()); -#endif notify_start(); @@ -507,9 +503,7 @@ int main(int argc, char ** argv) arq_close(); -#if USE_XMLRPC XML_RPC_Server::stop(); -#endif if (progdefaults.usepskrep) pskrep_stop(); @@ -587,7 +581,6 @@ void generate_option_help(void) { << " Look for auto-send files in DIRECTORY\n" << " The default is " << HomeDir << "/autosend" << "\n\n" -#if USE_XMLRPC << " --xmlrpc-server-address HOSTNAME\n" << " Set the XML-RPC server address\n" << " The default is: " << progdefaults.xmlrpc_address << "\n\n" @@ -600,7 +593,6 @@ void generate_option_help(void) { << " Allow only the methods whose names don't match REGEX\n\n" << " --xmlrpc-list\n" << " List all available methods\n\n" -#endif #if BENCHMARK_MODE << " --benchmark-modem ID\n" @@ -739,10 +731,8 @@ int parse_args(int argc, char **argv, int& idx) OPT_FLMSG_DIR, OPT_AUTOSEND_DIR, -#if USE_XMLRPC OPT_CONFIG_XMLRPC_ADDRESS, OPT_CONFIG_XMLRPC_PORT, OPT_CONFIG_XMLRPC_ALLOW, OPT_CONFIG_XMLRPC_DENY, OPT_CONFIG_XMLRPC_LIST, -#endif #if BENCHMARK_MODE OPT_BENCHMARK_MODEM, OPT_BENCHMARK_AFC, OPT_BENCHMARK_SQL, OPT_BENCHMARK_SQLEVEL, @@ -775,13 +765,11 @@ int parse_args(int argc, char **argv, int& idx) { "cpu-speed-test", 0, 0, OPT_SHOW_CPU_CHECK }, -#if USE_XMLRPC { "xmlrpc-server-address", 1, 0, OPT_CONFIG_XMLRPC_ADDRESS }, { "xmlrpc-server-port", 1, 0, OPT_CONFIG_XMLRPC_PORT }, { "xmlrpc-allow", 1, 0, OPT_CONFIG_XMLRPC_ALLOW }, { "xmlrpc-deny", 1, 0, OPT_CONFIG_XMLRPC_DENY }, { "xmlrpc-list", 0, 0, OPT_CONFIG_XMLRPC_LIST }, -#endif #if BENCHMARK_MODE { "benchmark-modem", 1, 0, OPT_BENCHMARK_MODEM }, @@ -877,7 +865,6 @@ int parse_args(int argc, char **argv, int& idx) FLMSG_WRAP_auto_dir = optarg; break; -#if USE_XMLRPC case OPT_CONFIG_XMLRPC_ADDRESS: progdefaults.xmlrpc_address = optarg; break; @@ -899,7 +886,6 @@ int parse_args(int argc, char **argv, int& idx) case OPT_CONFIG_XMLRPC_LIST: XML_RPC_Server::list_methods(cout); exit(EXIT_SUCCESS); -#endif #if BENCHMARK_MODE case OPT_BENCHMARK_MODEM: @@ -1066,9 +1052,6 @@ void generate_version_text(void) #if USE_HAMLIB s << " " "Hamlib " << HAMLIB_BUILD_VERSION "\n"; #endif -#if USE_XMLRPC - s << " " "XMLRPC-C " << XMLRPC_BUILD_VERSION "\n\n"; -#endif s << "\nRuntime information:\n"; struct utsname u; diff --git a/src/misc/configuration.cxx b/src/misc/configuration.cxx index 10fcc092..29004693 100644 --- a/src/misc/configuration.cxx +++ b/src/misc/configuration.cxx @@ -585,10 +585,6 @@ int configuration::setDefaults() inpRIGdev->value(HamRigDevice.c_str()); mnuBaudRate->value(HamRigBaudrate); -#if !USE_XMLRPC - tabXMLRPC->parent()->remove(*tabXMLRPC); -#endif - inpXmlRigDevice->value(XmlRigDevice.c_str()); mnuXmlRigBaudrate->value(XmlRigBaudrate);