XMLRPC

* removed references to external xmlrpc-c library

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

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
-        ASCIIDOC_MAN_INST += fldigi-shell.1
-endif
     ASCIIDOC_HTML += guide.html
 endif
 

m4/xmlrpc.m4

@@ -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"])
-])

src/Makefile.am

@@ -45,6 +45,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
@@ -52,10 +54,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
@@ -116,13 +114,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

src/dialogs/fl_digi.cxx

@@ -138,9 +138,7 @@
 #include "soundconf.h"
 
 #include "htmlstrings.h"
-#if USE_XMLRPC
 #	include "xmlrpc.h"
-#endif
 #if BENCHMARK_MODE
 #	include "benchmark.h"
 #endif
@@ -6891,10 +6889,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)");
 }

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

src/main.cxx

@@ -104,9 +104,7 @@
 #include "qrunner.h"
 #include "stacktrace.h"
 
-#if USE_XMLRPC
+#include "xmlrpc.h"
-	#include "xmlrpc.h"
-#endif
 
 #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();
 
@@ -516,9 +512,7 @@ int main(int argc, char ** argv)
 
 	arq_close();
 
-#if USE_XMLRPC
 	XML_RPC_Server::stop();
-#endif
 
 	if (progdefaults.usepskrep)
 		pskrep_stop();
@@ -596,7 +590,6 @@ void generate_option_help(void) {
 	     << "    Look for wrap_auto_file files in DIRECTORY\n"
 	     << "    The default is " << FLMSG_dir_default << "WRAP/auto/" << "\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"
@@ -609,7 +602,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"
@@ -748,10 +740,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,
@@ -784,13 +774,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 },
@@ -898,7 +886,6 @@ int parse_args(int argc, char **argv, int& idx)
 		}
 			break;
 
-#if USE_XMLRPC
 		case OPT_CONFIG_XMLRPC_ADDRESS:
 			progdefaults.xmlrpc_address = optarg;
 			break;
@@ -920,7 +907,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:
@@ -1087,9 +1073,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;

src/misc/configuration.cxx

@@ -582,10 +582,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);